diff --git a/AWT startup.iml b/JIST.iml
similarity index 100%
rename from AWT startup.iml
rename to JIST.iml
diff --git a/resources/otherui.xml b/resources/otherui.xml
index 1a3d36b..ecab3f9 100644
--- a/resources/otherui.xml
+++ b/resources/otherui.xml
@@ -1,24 +1,6 @@
 <?xml version="1.0"?>
-<Window
-        Name="Window"
-        Visible="True"
-        Title="GUI DEMO"
-        Size="1024, 576">
-        <Button
-            BackgroundColor="#ff0000"
-            Label="Button 1"
-            Icon="circle"
-            Location="top_left"
-            Size="0.3f, 0.1f"/>
-        <ToggleButton
-            BackgroundColor="#00ff00"
-            Label="Button 2"
-            Icon="arrow_up_white"
-            Location="top_right"
-            Size="0.3f, 0.3f"/>
-        <Panel
-            BackgroundColor="#555555"
-            Size="0.5f, 0.5f"
-            Location="0f, 0.5f"
-        />
+<Window Visible="True" Size="1024, 576">
+        <Button BackgroundColor="#ff0000" Label="Button 1" Icon="circle" Location="top_left" Size="0.3f, 0.1f"/>
+        <ToggleButton BackgroundColor="#00ff00" Label="Button 2" Icon="arrow_up_white" Location="top_right" Size="0.3f, 0.3f"/>
+        <Panel BackgroundColor="#555555" Size="0.5f, 0.5f" Location="0f, 0.5f"/>
 </Window>
\ No newline at end of file
diff --git a/src/Main.java b/src/Main.java
index 1651dcf..b33ee90 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,20 +1,9 @@
-import guiTree.Components.Button;
-import guiTree.Components.Panel;
-import guiTree.Components.Picture;
-import guiTree.Visual;
-import guiTree.Window;
-import guiTree.events.MouseAdapter;
-import parser.XAMLParser;
-
-import java.awt.event.MouseEvent;
-import java.io.File;
+import parser.XMLParser;
 
 public class Main {
     public static void main(String[] args) {
-        Window window = null;
-        Visual.setEnableGPU(true);
         try {
-            window = XAMLParser.parse("otherui.xml");
+            XMLParser.parse("otherui.xml");
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/src/guiTree/Components/Button.java b/src/guiTree/Components/Button.java
index 210bc9b..e235e5a 100644
--- a/src/guiTree/Components/Button.java
+++ b/src/guiTree/Components/Button.java
@@ -82,8 +82,7 @@ public class Button extends MenuItem {
     }
 
     @Override
-    public void paint(Image imageBuffer)
-    {
+    public void paint(Image imageBuffer) {
         //Get Graphics
         Graphics2D g = (Graphics2D)imageBuffer.getGraphics();
         g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -109,7 +108,13 @@ public class Button extends MenuItem {
 
         //Draw Icon
         if(icon != null) {
-            int iconX = (getWidth() - iconWidth - textWidth - 10) / 2;
+            int iconX;
+            if(textWidth != 0) {
+                iconX = (getWidth() - iconWidth - textWidth - 10) / 2;
+            }
+            else {
+                iconX = (getWidth() - iconWidth) / 2;
+            }
             int iconY = (getHeight() - iconHeight)/2;
             Graphics2D g2 = (Graphics2D)imageBuffer.getGraphics();
             g2.drawImage(icon, iconX, iconY, null);
diff --git a/src/guiTree/Components/Decorations/Placers/LocationPlacerFactory.java b/src/guiTree/Components/Decorations/Placers/LocationPlacerFactory.java
new file mode 100644
index 0000000..6de73e8
--- /dev/null
+++ b/src/guiTree/Components/Decorations/Placers/LocationPlacerFactory.java
@@ -0,0 +1,38 @@
+package guiTree.Components.Decorations.Placers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class LocationPlacerFactory {
+    private static Map<String, Placer> placerMap;
+    private static boolean initialized = false;
+
+    public static Placer getPlacer(String name) {
+        if(!initialized) {
+            initialize();
+        }
+        if(placerMap.containsKey(name)) {
+            return placerMap.get(name);
+        }
+        return null;
+    }
+
+    public static void addPlacer(String name, Placer placer) {
+        placerMap.put(name, placer);
+    }
+
+    private static void initialize() {
+        initialized = true;
+        placerMap = new HashMap<>();
+        placerMap.put("top_left", new TopLeftPlacer());
+        placerMap.put("top_right", new TopRightPlacer());
+        placerMap.put("top_center", new TopCenterPlacer());
+        placerMap.put("middle_left", new MiddleLeftPlacer());
+        placerMap.put("middle_right", new MiddleRightPlacer());
+        placerMap.put("middle_center", new MiddleCenterPlacer());
+        placerMap.put("bottom_left", new BottomLeftPlacer());
+        placerMap.put("bottom_right", new BottomRightPlacer());
+        placerMap.put("bottom_center", new BottomCenterPlacer());
+        placerMap.put("general", new GeneralPlacer());
+    }
+}
diff --git a/src/guiTree/Helper/Debugger.java b/src/guiTree/Helper/Debugger.java
index 8e8f4fa..67326c2 100644
--- a/src/guiTree/Helper/Debugger.java
+++ b/src/guiTree/Helper/Debugger.java
@@ -2,7 +2,7 @@ package guiTree.Helper;
 
 public class Debugger {
     public enum Tag {
-        LISTENER(true),
+        LISTENER(false),
         PAINTING(false),
         FPS(false),
         ANIMATIONS(false),
@@ -10,6 +10,10 @@ public class Debugger {
 
         public boolean value;
 
+        private void setValue(Boolean value) {
+            this.value = value;
+        }
+
         Tag(boolean value) {
             this.value = value;
         }
@@ -22,4 +26,8 @@ public class Debugger {
             System.out.println("[" + tag.toString() + "] " + message);
         }
     }
+
+    public void enableTag(Tag tag, Boolean value) {
+        tag.setValue(value);
+    }
 }
diff --git a/src/guiTree/Visual.java b/src/guiTree/Visual.java
index f3342c9..83be5f2 100644
--- a/src/guiTree/Visual.java
+++ b/src/guiTree/Visual.java
@@ -12,13 +12,11 @@ import guiTree.events.MouseListener;
 import guiTree.events.MouseWheelListener;
 
 import javax.imageio.ImageIO;
-import javax.swing.*;
 import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 import java.awt.image.BufferedImage;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
@@ -237,48 +235,17 @@ public class Visual {
     public void setLocation(String location) {
         location = location.toLowerCase();
         Point4<Integer> margins = locationPlacer.getMargins();
-        switch (location) {
-            case "top_left": {
-                locationPlacer = new TopLeftPlacer();
-                break;
-            }
-            case "top_right": {
-                locationPlacer = new TopRightPlacer();
-                break;
-            }
-            case "top_center": {
-                locationPlacer = new TopCenterPlacer();
-                break;
-            }
-            case "middle_left": {
-                locationPlacer = new MiddleLeftPlacer();
-                break;
-            }
-            case "middle_center": {
-                locationPlacer = new MiddleCenterPlacer();
-                break;
-            }
-            case "middle_right": {
-                locationPlacer = new MiddleRightPlacer();
-                break;
-            }
-            case "bottom_left": {
-                locationPlacer = new BottomLeftPlacer();
-                break;
-            }
-            case "bottom_center": {
-                locationPlacer = new BottomCenterPlacer();
-                break;
-            }
-            case "bottom_right": {
-                locationPlacer = new BottomRightPlacer();
-                break;
-            }
-            default: {
-                System.err.println("Not a valid location");
-                return;
-            }
+        Point2<Integer> absLocation = locationPlacer.getLocation();
+        Point2<Float> relativeLocation = locationPlacer.getRelativeLocation();
+
+        Placer placer = LocationPlacerFactory.getPlacer(location);
+        if(placer == null) {
+            System.out.println("Not a valid placer " + location);
+            return;
         }
+        locationPlacer = placer;
+        locationPlacer.setLocation(absLocation.x, absLocation.y);
+        locationPlacer.setRelativeLocation(relativeLocation.x, relativeLocation.y);
         locationPlacer.setElementSize(width, height);
         locationPlacer.setMargins(margins.a, margins.b, margins.c, margins.d);
         if(parent != null) {
@@ -337,14 +304,14 @@ public class Visual {
         update();
     }
 
-    public void setHardwareAccelerated(Boolean hardwareAccelerated) {
+    public void setHardwareAcceleratedOnElement(Boolean hardwareAccelerated) {
         this.hardwareAccelerated = hardwareAccelerated;
-        children.forEach(f -> f.setHardwareAccelerated(hardwareAccelerated));
+        children.forEach(f -> f.setHardwareAcceleratedOnElement(hardwareAccelerated));
         initializeImageBuffer();
         update();
     }
 
-    public static void setEnableGPU(Boolean gpu) {
+    public static void setHardwareAcceleration(Boolean gpu) {
         useGPU = gpu;
         System.setProperty("sun.java2d.opengl", "true");
         System.setProperty("sun.java2d.accthreshold", "0");
@@ -377,6 +344,10 @@ public class Visual {
         return height;
     }
 
+    public Point2<Integer> getSize(){
+        return new Point2<>(width, height);
+    }
+
     public Point2<Float> getRelativeSize() {
         return new Point2<>(relativeWidth, relativeHeight);
     }
@@ -439,11 +410,11 @@ public class Visual {
         return paintColor;
     }
 
-    public boolean isHardwareAccelerated() {
+    public boolean isElementHardwareAccelerated() {
         return hardwareAccelerated;
     }
 
-    public boolean isGpuEnabled() {
+    public boolean isHardwareAccelerationEnabled() {
         return useGPU;
     }
 
@@ -510,6 +481,16 @@ public class Visual {
         update();
     }
 
+    public void removeAllVisuals() {
+        children.forEach(f -> {
+            f.parent = null;
+            f.imageBuffer = null;
+            f.deactivate();
+        });
+        children.clear();
+
+    }
+
     private void setParent(Visual parent) {
         locationPlacer.setParentSize(parent.width, parent.height);
         this.parent = parent;
@@ -549,14 +530,11 @@ public class Visual {
                 i--;
             }
         }
+        validating.lock();
         if(dirty && active) {
-            validating.lock();
-            try {
-                revalidate();
-            } finally {
-                validating.unlock();
-            }
+            revalidate();
         }
+        validating.unlock();
     }
 
     private void revalidate() {
@@ -567,6 +545,7 @@ public class Visual {
 
         clearImageBuffer();
         paint(imageBuffer);
+
         for (int i = 0; i < children.size(); i++) {
             Visual v = children.get(i);
             if (v.dirty && v.active) {
@@ -897,11 +876,11 @@ public class Visual {
     }
 
     public void update() {
+        validating.lock();
         if(!dirty) {
-            validating.lock();
             dirty = true;
-            validating.unlock();
         }
+        validating.unlock();
 
         if(parent != null) {
             parent.update();
diff --git a/src/guiTree/Window.java b/src/guiTree/Window.java
index b150249..271a113 100644
--- a/src/guiTree/Window.java
+++ b/src/guiTree/Window.java
@@ -16,11 +16,12 @@ import java.awt.event.MouseEvent;
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
 import java.awt.image.BufferedImage;
-import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 
 public class Window extends Visual implements Runnable{
     public CustomFrame frame;
+    private int FPS;
     private TitleBar titleBar;
     private Panel mainPanel;
     private Panel contentPanel;
@@ -46,12 +47,15 @@ public class Window extends Visual implements Runnable{
 
         BufferedImage icon = null;
         try {
-            icon = ImageIO.read(new File("resources\\icons\\square_white.png"));
+            InputStream iconStream = getClass().getClassLoader().getResourceAsStream("icons/square_white.png");
+            assert iconStream != null;
+            icon = ImageIO.read(iconStream);
         } catch (IOException e) {
             e.printStackTrace();
         }
         TitleBar bar = new TitleBar(title, icon);
         bar.setName("TitleBar");
+        FPS = 60;
         bar.setBackgroundColor(Color.GRAY);
         this.setTitleBar(bar);
         close = false;
@@ -158,6 +162,10 @@ public class Window extends Visual implements Runnable{
         frame.setLocationRelativeTo(null);
     }
 
+    public void setFPS(int FPS) {
+        this.FPS = FPS;
+    }
+
     public void setUndecorated(Boolean undecorated){frame.setUndecorated(undecorated);}
 
     public void setState(int state) {
@@ -258,7 +266,7 @@ public class Window extends Visual implements Runnable{
         frameTimer.startTiming();
         secondTimer.startTiming();
         while(!close) {
-            if(frameTimer.getTime() >= 1000/60) {
+            if(frameTimer.getTime() >= 1000/FPS) {
                 repaint();
                 frameTimer.startTiming();
                 frames ++;
diff --git a/src/parser/XAMLParser.java b/src/parser/XMLParser.java
similarity index 61%
rename from src/parser/XAMLParser.java
rename to src/parser/XMLParser.java
index 2547f29..ce4aa73 100644
--- a/src/parser/XAMLParser.java
+++ b/src/parser/XMLParser.java
@@ -6,18 +6,19 @@ import guiTree.Helper.Debugger;
 import guiTree.Visual;
 import guiTree.Window;
 import org.w3c.dom.*;
+import parser.converters.ConverterInterface;
 
 import javax.xml.parsers.*;
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
+import java.net.URL;
+import java.util.*;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 
-public class XAMLParser {
-    private final static String packageGuiTree = "guiTree.";
-    private final static String packageComponents = "guiTree.Components.";
-    private final static String packageDecorations = "guiTree.Components.Decorations.";
+public class XMLParser {
+    private static Map<String, Class<?>> classMap;
     private static Converter valueConverter = new Converter();
 
     private static void setAttributes(Object object, NamedNodeMap attributeList){
@@ -68,9 +69,12 @@ public class XAMLParser {
     public static Window parse(String filepath) throws Exception {
         Object rootObject;
         Debugger.log("Started", Debugger.Tag.PARSING);
-        FileInputStream fileIS = new FileInputStream(new File("resources/" + filepath));
+        InputStream fileIS = XMLParser.class.getClassLoader().getResourceAsStream(filepath);
+
         DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = builderFactory.newDocumentBuilder();
+        Class<?>[] classes = getClasses();
+        classMap = createClassTable(classes);
         Document xmlDocument = builder.parse(fileIS);
 
         xmlDocument.normalize();
@@ -117,18 +121,8 @@ public class XAMLParser {
     }
 
     private static Object parseNode(Node parentNode)throws Exception{
-        Class<?> parentClass;
-        try {
-            parentClass = Class.forName(packageComponents.concat(parentNode.getNodeName()));
-        }
-        catch (ClassNotFoundException e) {
-            try {
-                parentClass = Class.forName(packageGuiTree.concat(parentNode.getNodeName()));
-            }
-            catch (ClassNotFoundException f) {
-                parentClass = Class.forName(packageDecorations.concat(parentNode.getNodeName()));
-            }
-        }
+        Class<?> parentClass = classMap.get(parentNode.getNodeName());
+
         Debugger.log("Parsing " + parentClass, Debugger.Tag.PARSING);
         Object parentObject = parentClass.getDeclaredConstructor().newInstance();
         Debugger.log("Constructor called successfully for " + parentObject, Debugger.Tag.PARSING);
@@ -161,6 +155,89 @@ public class XAMLParser {
         return parentObject;
     }
 
+    private static Class<?>[] getClasses()
+            throws ClassNotFoundException, IOException {
+        URL classRoot = XMLParser.class.getProtectionDomain().getCodeSource().getLocation();
+        URL projectRoot = ClassLoader.getSystemResource("");
+        File dir;
+        ClassLoader classLoader = XMLParser.class.getClassLoader();
+
+        ArrayList<Class<?>> classes = new ArrayList<>();
+
+        String path = classRoot.getPath();
+        if(path.indexOf('.') > 0) {
+            if (path.substring(path.lastIndexOf('.')).equals(".jar")) {
+                JarFile jarFile = new JarFile(classRoot.getPath());
+                Enumeration<JarEntry> jarEntries = jarFile.entries();
+                while (jarEntries.hasMoreElements()) {
+                    JarEntry jarEntry = jarEntries.nextElement();
+                    String filePath = jarEntry.getName();
+                    if (filePath.indexOf('.') < 0) {
+                        continue;
+                    }
+                    if (filePath.substring(filePath.lastIndexOf('.')).equals(".class")) {
+                        filePath = filePath.replaceAll("/", ".");
+                        classes.add(Class.forName(filePath.substring(0, filePath.lastIndexOf('.'))));
+                    }
+                }
+            }
+        }
+        else {
+            dir = new File(classRoot.getFile());
+            classes.addAll(findClasses(dir, ""));
+        }
+        if(!projectRoot.getPath().equals(classRoot.getPath())){
+            dir = new File(projectRoot.getFile());
+            classes.addAll(findClasses(dir, ""));
+        }
+
+        return classes.toArray(new Class[0]);
+    }
+
+
+    private static List<Class<?>> findClasses(File directory, String packageName) throws ClassNotFoundException {
+        Debugger.log("Getting Classes from Directory: " + directory.getName(), Debugger.Tag.PARSING);
+        List<Class<?>> classes = new ArrayList<>();
+        if (!directory.exists()) {
+            return classes;
+        }
+        File[] files = directory.listFiles();
+        if(files == null) {
+            return classes;
+        }
+        for (File file : files) {
+            if (file.isDirectory()) {
+                assert !file.getName().contains(".");
+                classes.addAll(findClasses(file, packageName + "." + file.getName()));
+            } else if (file.getName().endsWith(".class")) {
+                if(packageName.length() == 0) {
+                    classes.add(Class.forName(file.getName().substring(0, file.getName().length() - 6)));
+                }
+                else {
+                    classes.add(Class.forName(packageName.substring(1) + '.' + file.getName().substring(0, file.getName().length() - 6)));
+                }
+            }
+        }
+        return classes;
+    }
+
+    private static Map<String, Class<?>> createClassTable(Class<?>[] classes) {
+        Map<String, Class<?>> map = new HashMap<>();
+        for(Class<?> c: classes) {
+            if(c.getName().indexOf('.') >= 0) {
+                map.put(c.getName().substring(c.getName().lastIndexOf('.') + 1), c);
+            }
+            else {
+                map.put(c.getName(), c);
+            }
+        }
+        return map;
+    }
+
+    public static void addConverter(ConverterInterface<?> converterInterface) {
+        valueConverter.addConverter(converterInterface);
+    }
+
     private static void addVisual(Visual parentObject, Visual childObject){
         parentObject.addVisual(childObject);
     }
diff --git a/src/parser/converters/BooleanConverter.java b/src/parser/converters/BooleanConverter.java
index 05896f4..d47df83 100644
--- a/src/parser/converters/BooleanConverter.java
+++ b/src/parser/converters/BooleanConverter.java
@@ -7,4 +7,9 @@ public class BooleanConverter implements ConverterInterface<Boolean> {
         content = content.replaceAll(" ", "");
         return Boolean.valueOf(content);
     }
+
+    @Override
+    public Class<?> getConversionClass() {
+        return Boolean.class;
+    }
 }
diff --git a/src/parser/converters/ColorConverter.java b/src/parser/converters/ColorConverter.java
index 4f2297d..49fa0ae 100644
--- a/src/parser/converters/ColorConverter.java
+++ b/src/parser/converters/ColorConverter.java
@@ -8,4 +8,9 @@ public class ColorConverter implements ConverterInterface<Color> {
         content = content.replaceAll(" ", "");
         return Color.decode(content);
     }
+
+    @Override
+    public Class<?> getConversionClass() {
+        return Color.class;
+    }
 }
diff --git a/src/parser/converters/Converter.java b/src/parser/converters/Converter.java
index bc5cf59..fa13b07 100644
--- a/src/parser/converters/Converter.java
+++ b/src/parser/converters/Converter.java
@@ -30,4 +30,8 @@ public class Converter {
         }
         throw new InvalidClassException(type.getName());
     }
+
+    public void addConverter(ConverterInterface<?> converterInterface) {
+        converterTable.put(converterInterface.getConversionClass(), converterInterface);
+    }
 }
diff --git a/src/parser/converters/ConverterInterface.java b/src/parser/converters/ConverterInterface.java
index 63d17fe..d6ceb16 100644
--- a/src/parser/converters/ConverterInterface.java
+++ b/src/parser/converters/ConverterInterface.java
@@ -4,4 +4,5 @@ import java.io.InvalidClassException;
 
 public interface ConverterInterface<T> {
     T convert(String content) throws InvalidClassException;
+    Class<?> getConversionClass();
 }
diff --git a/src/parser/converters/DirectionConverter.java b/src/parser/converters/DirectionConverter.java
index 6a8c295..0714fe2 100644
--- a/src/parser/converters/DirectionConverter.java
+++ b/src/parser/converters/DirectionConverter.java
@@ -16,4 +16,9 @@ public class DirectionConverter implements ConverterInterface<Slider.Direction>
         }
         throw new InvalidClassException(Slider.Direction.class.getName());
     }
+
+    @Override
+    public Class<?> getConversionClass() {
+        return Slider.Direction.class;
+    }
 }
diff --git a/src/parser/converters/DoubleConverter.java b/src/parser/converters/DoubleConverter.java
index 57ab94d..077ef54 100644
--- a/src/parser/converters/DoubleConverter.java
+++ b/src/parser/converters/DoubleConverter.java
@@ -7,4 +7,9 @@ public class DoubleConverter implements ConverterInterface<Double>{
         content = content.replaceAll(" ", "");
         return Double.parseDouble(content);
     }
+
+    @Override
+    public Class<?> getConversionClass() {
+        return Double.class;
+    }
 }
diff --git a/src/parser/converters/FloatConverter.java b/src/parser/converters/FloatConverter.java
index 0dd582c..bd5fb2f 100644
--- a/src/parser/converters/FloatConverter.java
+++ b/src/parser/converters/FloatConverter.java
@@ -15,4 +15,9 @@ public class FloatConverter implements ConverterInterface<Float> {
 
         return Float.parseFloat(content);
     }
+
+    @Override
+    public Class<?> getConversionClass() {
+        return Float.class;
+    }
 }
diff --git a/src/parser/converters/IntegerConverter.java b/src/parser/converters/IntegerConverter.java
index 48cff32..455b3b0 100644
--- a/src/parser/converters/IntegerConverter.java
+++ b/src/parser/converters/IntegerConverter.java
@@ -7,4 +7,9 @@ public class IntegerConverter implements ConverterInterface<Integer> {
         content = content.replaceAll(" ", "");
         return Integer.parseInt(content);
     }
+
+    @Override
+    public Class<?> getConversionClass() {
+        return Integer.class;
+    }
 }
diff --git a/src/parser/converters/StringConverter.java b/src/parser/converters/StringConverter.java
index 11649b1..2eb9f0b 100644
--- a/src/parser/converters/StringConverter.java
+++ b/src/parser/converters/StringConverter.java
@@ -6,4 +6,9 @@ public class StringConverter implements ConverterInterface<String> {
     public String convert(String content) {
         return content;
     }
+
+    @Override
+    public Class<?> getConversionClass() {
+        return String.class;
+    }
 }