diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java b/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
index ffdff2ac..dccc2911 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
@@ -3,7 +3,7 @@ package com.bartlomiejpluta.base.api.context;
 import com.bartlomiejpluta.base.api.animation.Animation;
 import com.bartlomiejpluta.base.api.camera.Camera;
 import com.bartlomiejpluta.base.api.entity.Entity;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.GUI;
 import com.bartlomiejpluta.base.api.image.Image;
 import com.bartlomiejpluta.base.api.input.Input;
 import com.bartlomiejpluta.base.api.runner.GameRunner;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Color.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Color.java
similarity index 91%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Color.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/Color.java
index 3ef48687..860bbec1 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Color.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Color.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.base;
+package com.bartlomiejpluta.base.api.gui;
 
 public interface Color {
    void setRGB(float red, float green, float blue);
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Component.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Component.java
similarity index 67%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Component.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/Component.java
index 39d8a8cf..330fca60 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Component.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Component.java
@@ -1,6 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.component;
-
-import com.bartlomiejpluta.base.api.gui.base.Widget;
+package com.bartlomiejpluta.base.api.gui;
 
 public interface Component extends Widget {
    Iterable<Component> getChildren();
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/DisplayMode.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/DisplayMode.java
similarity index 55%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/window/DisplayMode.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/DisplayMode.java
index f8abacfe..8c471b2c 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/DisplayMode.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/DisplayMode.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.window;
+package com.bartlomiejpluta.base.api.gui;
 
 public enum DisplayMode {
    DISPLAY_STACK,
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/GUI.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/GUI.java
similarity index 95%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/base/GUI.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/GUI.java
index 05f2d347..0005cc20 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/GUI.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/GUI.java
@@ -1,7 +1,5 @@
-package com.bartlomiejpluta.base.api.gui.base;
+package com.bartlomiejpluta.base.api.gui;
 
-import com.bartlomiejpluta.base.api.gui.component.Component;
-import com.bartlomiejpluta.base.api.gui.window.Window;
 import com.bartlomiejpluta.base.api.input.KeyEventHandler;
 import com.bartlomiejpluta.base.internal.gc.Disposable;
 import com.bartlomiejpluta.base.internal.render.Renderable;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Image.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Image.java
similarity index 58%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Image.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/Image.java
index 923c6685..6b0b08a7 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Image.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Image.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.base;
+package com.bartlomiejpluta.base.api.gui;
 
 public interface Image {
    int getWidth();
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Inflatable.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Inflatable.java
similarity index 64%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Inflatable.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/Inflatable.java
index 76f4a428..48371625 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Inflatable.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Inflatable.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.window;
+package com.bartlomiejpluta.base.api.gui;
 
 public interface Inflatable {
    default void onInflate() {
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/LineCap.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/LineCap.java
similarity index 61%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/base/LineCap.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/LineCap.java
index 3ca611c2..04b1e0ab 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/LineCap.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/LineCap.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.base;
+package com.bartlomiejpluta.base.api.gui;
 
 public enum LineCap {
    BUTT,
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/Paint.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Paint.java
new file mode 100644
index 00000000..218eac4c
--- /dev/null
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Paint.java
@@ -0,0 +1,4 @@
+package com.bartlomiejpluta.base.api.gui;
+
+public interface Paint {
+}
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Ref.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Ref.java
similarity index 84%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Ref.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/Ref.java
index 81f9eb79..6e415b52 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Ref.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Ref.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.window;
+package com.bartlomiejpluta.base.api.gui;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/SizeMode.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/SizeMode.java
similarity index 56%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/base/SizeMode.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/SizeMode.java
index 32c3b267..54a60de8 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/SizeMode.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/SizeMode.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.base;
+package com.bartlomiejpluta.base.api.gui;
 
 public enum SizeMode {
    AUTO,
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Widget.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Widget.java
similarity index 97%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Widget.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/Widget.java
index 34ca16d3..7c939a23 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Widget.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Widget.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.base;
+package com.bartlomiejpluta.base.api.gui;
 
 import com.bartlomiejpluta.base.api.input.KeyEventHandler;
 import com.bartlomiejpluta.base.api.screen.Screen;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/WindingDirection.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindingDirection.java
similarity index 59%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/base/WindingDirection.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/WindingDirection.java
index 21fb1229..d0f2b045 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/WindingDirection.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindingDirection.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.base;
+package com.bartlomiejpluta.base.api.gui;
 
 public enum WindingDirection {
    CLOCKWISE,
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Window.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Window.java
similarity index 67%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Window.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/Window.java
index 0732a2b6..766cf1a7 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Window.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Window.java
@@ -1,7 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.window;
-
-import com.bartlomiejpluta.base.api.gui.base.Widget;
-import com.bartlomiejpluta.base.api.gui.component.Component;
+package com.bartlomiejpluta.base.api.gui;
 
 public interface Window extends Widget {
    void setContent(Component component);
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowManager.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowManager.java
similarity index 95%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowManager.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowManager.java
index 127beb16..f8172fff 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowManager.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowManager.java
@@ -1,10 +1,8 @@
-package com.bartlomiejpluta.base.api.gui.window;
+package com.bartlomiejpluta.base.api.gui;
 
-import com.bartlomiejpluta.base.api.gui.base.BaseWidget;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.base.SizeMode;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
 import com.bartlomiejpluta.base.api.screen.Screen;
+import com.bartlomiejpluta.base.lib.gui.BaseWidget;
 
 import java.util.Deque;
 import java.util.LinkedList;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowPosition.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowPosition.java
similarity index 74%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowPosition.java
rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowPosition.java
index cfa01dcb..a81d7c0f 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowPosition.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowPosition.java
@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.api.gui.window;
+package com.bartlomiejpluta.base.api.gui;
 
 public enum WindowPosition {
    TOP,
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Paint.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Paint.java
deleted file mode 100644
index 614d4229..00000000
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Paint.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.bartlomiejpluta.base.api.gui.base;
-
-public interface Paint {
-}
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Container.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Container.java
deleted file mode 100644
index 3214fc4a..00000000
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Container.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.bartlomiejpluta.base.api.gui.component;
-
-public interface Container extends Component {
-}
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/animation/AnimationDelegate.java b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/AnimationDelegate.java
similarity index 97%
rename from api/src/main/java/com/bartlomiejpluta/base/api/animation/AnimationDelegate.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/animation/AnimationDelegate.java
index b9150c6e..0816ec03 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/animation/AnimationDelegate.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/AnimationDelegate.java
@@ -1,5 +1,6 @@
-package com.bartlomiejpluta.base.api.animation;
+package com.bartlomiejpluta.base.lib.animation;
 
+import com.bartlomiejpluta.base.api.animation.Animation;
 import com.bartlomiejpluta.base.api.camera.Camera;
 import com.bartlomiejpluta.base.api.map.layer.base.Layer;
 import com.bartlomiejpluta.base.api.move.Direction;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/lib/animation/DelayedAnimation.java b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/DelayedAnimation.java
index c810fd9a..97ccb299 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/lib/animation/DelayedAnimation.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/DelayedAnimation.java
@@ -1,7 +1,6 @@
 package com.bartlomiejpluta.base.lib.animation;
 
 import com.bartlomiejpluta.base.api.animation.Animation;
-import com.bartlomiejpluta.base.api.animation.AnimationDelegate;
 import com.bartlomiejpluta.base.api.camera.Camera;
 import com.bartlomiejpluta.base.api.screen.Screen;
 import com.bartlomiejpluta.base.internal.render.ShaderManager;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/entity/EntityDelegate.java b/api/src/main/java/com/bartlomiejpluta/base/lib/entity/EntityDelegate.java
similarity index 97%
rename from api/src/main/java/com/bartlomiejpluta/base/api/entity/EntityDelegate.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/entity/EntityDelegate.java
index 9f295200..a9f4ac35 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/entity/EntityDelegate.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/entity/EntityDelegate.java
@@ -1,6 +1,7 @@
-package com.bartlomiejpluta.base.api.entity;
+package com.bartlomiejpluta.base.lib.entity;
 
 import com.bartlomiejpluta.base.api.camera.Camera;
+import com.bartlomiejpluta.base.api.entity.Entity;
 import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer;
 import com.bartlomiejpluta.base.api.move.Direction;
 import com.bartlomiejpluta.base.api.move.Movement;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/AbsoluteLayout.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/AbsoluteLayout.java
similarity index 90%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/AbsoluteLayout.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/AbsoluteLayout.java
index 056932e4..51d4bccd 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/AbsoluteLayout.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/AbsoluteLayout.java
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.base.SizeMode;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.SizeMode;
 import com.bartlomiejpluta.base.api.screen.Screen;
 
 public class AbsoluteLayout extends BaseContainer {
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseComponent.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseComponent.java
similarity index 85%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseComponent.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseComponent.java
index a0f5fe17..d206c124 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseComponent.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseComponent.java
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.BaseWidget;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.Component;
+import com.bartlomiejpluta.base.api.gui.GUI;
 
 import static java.util.Collections.emptyList;
 
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseContainer.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseContainer.java
similarity index 92%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseContainer.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseContainer.java
index 7b2f5a04..064e8fb0 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseContainer.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseContainer.java
@@ -1,7 +1,8 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.Component;
+import com.bartlomiejpluta.base.api.gui.GUI;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
 
 import java.util.LinkedList;
@@ -10,7 +11,7 @@ import java.util.List;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
 
-public abstract class BaseContainer extends BaseComponent implements Container {
+public abstract class BaseContainer extends BaseComponent {
    protected final List<Component> children = new LinkedList<>();
    private final List<Component> readOnlyChildren = unmodifiableList(children);
 
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/BaseWidget.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWidget.java
similarity index 97%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/base/BaseWidget.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWidget.java
index b4245f94..13ca181f 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/BaseWidget.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWidget.java
@@ -1,5 +1,7 @@
-package com.bartlomiejpluta.base.api.gui.base;
+package com.bartlomiejpluta.base.lib.gui;
 
+import com.bartlomiejpluta.base.api.gui.SizeMode;
+import com.bartlomiejpluta.base.api.gui.Widget;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
 
 public abstract class BaseWidget implements Widget {
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/BaseWindow.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWindow.java
similarity index 89%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/window/BaseWindow.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWindow.java
index 6943d1e2..1c3f9849 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/BaseWindow.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWindow.java
@@ -1,9 +1,7 @@
-package com.bartlomiejpluta.base.api.gui.window;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.BaseWidget;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.component.Component;
+import com.bartlomiejpluta.base.api.gui.*;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
 import com.bartlomiejpluta.base.api.screen.Screen;
 
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BorderLayout.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BorderLayout.java
similarity index 96%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BorderLayout.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/BorderLayout.java
index 6fb31866..ac76b1aa 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BorderLayout.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BorderLayout.java
@@ -1,8 +1,9 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.base.SizeMode;
+import com.bartlomiejpluta.base.api.gui.Component;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.SizeMode;
 import com.bartlomiejpluta.base.api.screen.Screen;
 
 public class BorderLayout extends BaseContainer {
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ComponentWrapper.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/ComponentWrapper.java
similarity index 87%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ComponentWrapper.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/ComponentWrapper.java
index 5569f105..b698a246 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ComponentWrapper.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/ComponentWrapper.java
@@ -1,7 +1,8 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.Component;
+import com.bartlomiejpluta.base.api.gui.GUI;
 import com.bartlomiejpluta.base.api.screen.Screen;
 
 import static java.util.Objects.requireNonNull;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HLayout.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/HLayout.java
similarity index 90%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HLayout.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/HLayout.java
index fce4cb03..650c8ddc 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HLayout.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/HLayout.java
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.GUI;
 import com.bartlomiejpluta.base.api.screen.Screen;
 
 public class HLayout extends BaseContainer {
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HOptionChoice.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/HOptionChoice.java
similarity index 95%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HOptionChoice.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/HOptionChoice.java
index b22c6fbc..643e4a9e 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HOptionChoice.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/HOptionChoice.java
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.GUI;
 import com.bartlomiejpluta.base.api.input.Key;
 import com.bartlomiejpluta.base.api.input.KeyAction;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HScrollableLayout.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/HScrollableLayout.java
similarity index 95%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HScrollableLayout.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/HScrollableLayout.java
index 26847e40..8f996534 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HScrollableLayout.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/HScrollableLayout.java
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.base.SizeMode;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.SizeMode;
 import com.bartlomiejpluta.base.api.input.Key;
 import com.bartlomiejpluta.base.api.input.KeyAction;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ImageView.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/ImageView.java
similarity index 90%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ImageView.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/ImageView.java
index a8e45029..632835ea 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ImageView.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/ImageView.java
@@ -1,9 +1,9 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.base.Image;
-import com.bartlomiejpluta.base.api.gui.base.Paint;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.Image;
+import com.bartlomiejpluta.base.api.gui.Paint;
 import com.bartlomiejpluta.base.api.screen.Screen;
 
 public class ImageView extends BaseComponent {
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Label.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/Label.java
similarity index 94%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Label.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/Label.java
index 22d75b8d..6a88655b 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Label.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/Label.java
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.Color;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.Color;
+import com.bartlomiejpluta.base.api.gui.GUI;
 import com.bartlomiejpluta.base.api.screen.Screen;
 
 import static java.util.Objects.requireNonNull;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VLayout.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/VLayout.java
similarity index 90%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VLayout.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/VLayout.java
index 03caf795..a82b2bdf 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VLayout.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/VLayout.java
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.GUI;
 import com.bartlomiejpluta.base.api.screen.Screen;
 
 public class VLayout extends BaseContainer {
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VOptionChoice.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/VOptionChoice.java
similarity index 95%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VOptionChoice.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/VOptionChoice.java
index d6f50580..1e600749 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VOptionChoice.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/VOptionChoice.java
@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.GUI;
 import com.bartlomiejpluta.base.api.input.Key;
 import com.bartlomiejpluta.base.api.input.KeyAction;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VScrollableLayout.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/VScrollableLayout.java
similarity index 95%
rename from api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VScrollableLayout.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/gui/VScrollableLayout.java
index 1398a603..edb3d960 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VScrollableLayout.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/VScrollableLayout.java
@@ -1,8 +1,8 @@
-package com.bartlomiejpluta.base.api.gui.component;
+package com.bartlomiejpluta.base.lib.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.base.SizeMode;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.SizeMode;
 import com.bartlomiejpluta.base.api.input.Key;
 import com.bartlomiejpluta.base.api.input.KeyAction;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/rule/BaseRule.java b/api/src/main/java/com/bartlomiejpluta/base/lib/rule/BaseRule.java
similarity index 87%
rename from api/src/main/java/com/bartlomiejpluta/base/api/rule/BaseRule.java
rename to api/src/main/java/com/bartlomiejpluta/base/lib/rule/BaseRule.java
index 3797d771..1e9cc1a5 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/rule/BaseRule.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/rule/BaseRule.java
@@ -1,6 +1,7 @@
-package com.bartlomiejpluta.base.api.rule;
+package com.bartlomiejpluta.base.lib.rule;
 
 import com.bartlomiejpluta.base.api.entity.Entity;
+import com.bartlomiejpluta.base.api.rule.Rule;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java
index 62502191..8cc9073c 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java
@@ -4,7 +4,7 @@ import com.bartlomiejpluta.base.api.animation.Animation;
 import com.bartlomiejpluta.base.api.camera.Camera;
 import com.bartlomiejpluta.base.api.context.Context;
 import com.bartlomiejpluta.base.api.entity.Entity;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
+import com.bartlomiejpluta.base.api.gui.GUI;
 import com.bartlomiejpluta.base.api.image.Image;
 import com.bartlomiejpluta.base.api.input.Input;
 import com.bartlomiejpluta.base.api.map.handler.MapHandler;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGColor.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGColor.java
index 1593b9ff..c976fd85 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGColor.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGColor.java
@@ -1,6 +1,6 @@
 package com.bartlomiejpluta.base.engine.gui.render;
 
-import com.bartlomiejpluta.base.api.gui.base.Color;
+import com.bartlomiejpluta.base.api.gui.Color;
 import com.bartlomiejpluta.base.internal.gc.Disposable;
 import lombok.*;
 import org.lwjgl.nanovg.NVGColor;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGGUI.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGGUI.java
index 37202c4d..143ef96e 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGGUI.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGGUI.java
@@ -2,9 +2,7 @@ package com.bartlomiejpluta.base.engine.gui.render;
 
 import com.bartlomiejpluta.base.api.camera.Camera;
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.*;
-import com.bartlomiejpluta.base.api.gui.component.Component;
-import com.bartlomiejpluta.base.api.gui.window.Window;
+import com.bartlomiejpluta.base.api.gui.*;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
 import com.bartlomiejpluta.base.api.screen.Screen;
 import com.bartlomiejpluta.base.engine.error.AppException;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGImage.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGImage.java
index 824c2f94..6edb8c8e 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGImage.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGImage.java
@@ -1,6 +1,6 @@
 package com.bartlomiejpluta.base.engine.gui.render;
 
-import com.bartlomiejpluta.base.api.gui.base.Image;
+import com.bartlomiejpluta.base.api.gui.Image;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGPaint.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGPaint.java
index 0c823a23..f9174b5a 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGPaint.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGPaint.java
@@ -1,6 +1,6 @@
 package com.bartlomiejpluta.base.engine.gui.render;
 
-import com.bartlomiejpluta.base.api.gui.base.Paint;
+import com.bartlomiejpluta.base.api.gui.Paint;
 import com.bartlomiejpluta.base.internal.gc.Disposable;
 import lombok.*;
 import org.lwjgl.nanovg.NVGPaint;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/widget/ScreenWidget.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/widget/ScreenWidget.java
index 764a4430..b0333b6a 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/widget/ScreenWidget.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/widget/ScreenWidget.java
@@ -1,8 +1,8 @@
 package com.bartlomiejpluta.base.engine.gui.widget;
 
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.base.SizeMode;
-import com.bartlomiejpluta.base.api.gui.base.Widget;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.SizeMode;
+import com.bartlomiejpluta.base.api.gui.Widget;
 import com.bartlomiejpluta.base.api.input.KeyEvent;
 import com.bartlomiejpluta.base.api.screen.Screen;
 import lombok.Getter;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java
index a409f648..74b660a8 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java
@@ -1,14 +1,7 @@
 package com.bartlomiejpluta.base.engine.gui.xml.inflater;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.base.SizeMode;
-import com.bartlomiejpluta.base.api.gui.base.Widget;
-import com.bartlomiejpluta.base.api.gui.component.Component;
-import com.bartlomiejpluta.base.api.gui.window.Inflatable;
-import com.bartlomiejpluta.base.api.gui.window.Ref;
-import com.bartlomiejpluta.base.api.gui.window.Window;
-import com.bartlomiejpluta.base.api.gui.window.WindowPosition;
+import com.bartlomiejpluta.base.api.gui.*;
 import com.bartlomiejpluta.base.engine.error.AppException;
 import com.bartlomiejpluta.base.engine.util.reflection.ClassLoader;
 import lombok.SneakyThrows;
diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/Inflater.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/Inflater.java
index 833a19d0..04ce48e7 100644
--- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/Inflater.java
+++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/Inflater.java
@@ -1,9 +1,9 @@
 package com.bartlomiejpluta.base.engine.gui.xml.inflater;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.base.GUI;
-import com.bartlomiejpluta.base.api.gui.component.Component;
-import com.bartlomiejpluta.base.api.gui.window.Window;
+import com.bartlomiejpluta.base.api.gui.Component;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.Window;
 
 import java.io.File;
 import java.io.InputStream;