20 files changed, 26 insertions, 26 deletions
diff --git a/core/src/ch/asynk/zproject/engine/Assets.java b/core/src/ch/asynk/gdx/board/Assets.java
index c421aff..3678129 100644
--- a/core/src/ch/asynk/zproject/engine/Assets.java
+++ b/core/src/ch/asynk/gdx/board/Assets.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine;
+package ch.asynk.gdx.board;
 
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.graphics.Texture;
diff --git a/core/src/ch/asynk/zproject/engine/Board.java b/core/src/ch/asynk/gdx/board/Board.java
index 9487e1d..0089ad7 100644
--- a/core/src/ch/asynk/zproject/engine/Board.java
+++ b/core/src/ch/asynk/gdx/board/Board.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine;
+package ch.asynk.gdx.board;
 
 import com.badlogic.gdx.math.Vector2;
 
diff --git a/core/src/ch/asynk/zproject/engine/Camera.java b/core/src/ch/asynk/gdx/board/Camera.java
index a560d85..4c1a1b6 100644
--- a/core/src/ch/asynk/zproject/engine/Camera.java
+++ b/core/src/ch/asynk/gdx/board/Camera.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine;
+package ch.asynk.gdx.board;
 
 import com.badlogic.gdx.graphics.glutils.HdpiUtils;
 import com.badlogic.gdx.graphics.OrthographicCamera;
diff --git a/core/src/ch/asynk/zproject/engine/Drawable.java b/core/src/ch/asynk/gdx/board/Drawable.java
index 300dd38..53559dc 100644
--- a/core/src/ch/asynk/zproject/engine/Drawable.java
+++ b/core/src/ch/asynk/gdx/board/Drawable.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine;
+package ch.asynk.gdx.board;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
diff --git a/core/src/ch/asynk/zproject/engine/Touchable.java b/core/src/ch/asynk/gdx/board/Touchable.java
index a1390be..533ec96 100644
--- a/core/src/ch/asynk/zproject/engine/Touchable.java
+++ b/core/src/ch/asynk/gdx/board/Touchable.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine;
+package ch.asynk.gdx.board;
 
 public interface Touchable
 {
diff --git a/core/src/ch/asynk/zproject/engine/board/BoardFactory.java b/core/src/ch/asynk/gdx/board/board/BoardFactory.java
index 7c472b9..fc30e72 100644
--- a/core/src/ch/asynk/zproject/engine/board/BoardFactory.java
+++ b/core/src/ch/asynk/gdx/board/board/BoardFactory.java
@@ -1,6 +1,6 @@
-package ch.asynk.gdx.board.engine.board;
+package ch.asynk.gdx.board.board;
 
-import ch.asynk.gdx.board.engine.Board;
+import ch.asynk.gdx.board.Board;
 
 public class BoardFactory
 {
diff --git a/core/src/ch/asynk/zproject/engine/board/HexBoard.java b/core/src/ch/asynk/gdx/board/board/HexBoard.java
index d639e0c..9d56a7c 100644
--- a/core/src/ch/asynk/zproject/engine/board/HexBoard.java
+++ b/core/src/ch/asynk/gdx/board/board/HexBoard.java
@@ -1,8 +1,8 @@
-package ch.asynk.gdx.board.engine.board;
+package ch.asynk.gdx.board.board;
 
 import com.badlogic.gdx.math.Vector2;
 
-import ch.asynk.gdx.board.engine.Board;
+import ch.asynk.gdx.board.Board;
 
 public class HexBoard implements Board
 {
diff --git a/core/src/ch/asynk/zproject/engine/board/SquareBoard.java b/core/src/ch/asynk/gdx/board/board/SquareBoard.java
index 824084f..f8da8d3 100644
--- a/core/src/ch/asynk/zproject/engine/board/SquareBoard.java
+++ b/core/src/ch/asynk/gdx/board/board/SquareBoard.java
@@ -1,8 +1,8 @@
-package ch.asynk.gdx.board.engine.board;
+package ch.asynk.gdx.board.board;
 
 import com.badlogic.gdx.math.Vector2;
 
-import ch.asynk.gdx.board.engine.Board;
+import ch.asynk.gdx.board.Board;
 
 public class SquareBoard implements Board
 {
diff --git a/core/src/ch/asynk/zproject/engine/ui/Alignment.java b/core/src/ch/asynk/gdx/board/ui/Alignment.java
index 6f2fa12..cb8f4a2 100644
--- a/core/src/ch/asynk/zproject/engine/ui/Alignment.java
+++ b/core/src/ch/asynk/gdx/board/ui/Alignment.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.ui;
+package ch.asynk.gdx.board.ui;
 
 public enum Alignment
 {
diff --git a/core/src/ch/asynk/zproject/engine/ui/Assembly.java b/core/src/ch/asynk/gdx/board/ui/Assembly.java
index dbd0c97..b7d329e 100644
--- a/core/src/ch/asynk/zproject/engine/ui/Assembly.java
+++ b/core/src/ch/asynk/gdx/board/ui/Assembly.java
@@ -1,9 +1,9 @@
-package ch.asynk.gdx.board.engine.ui;
+package ch.asynk.gdx.board.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 
-import ch.asynk.gdx.board.engine.util.IterableSet;
+import ch.asynk.gdx.board.util.IterableSet;
 
 public abstract class Assembly extends Element
 {
diff --git a/core/src/ch/asynk/zproject/engine/ui/Button.java b/core/src/ch/asynk/gdx/board/ui/Button.java
index 281dc49..f5f771a 100644
--- a/core/src/ch/asynk/zproject/engine/ui/Button.java
+++ b/core/src/ch/asynk/gdx/board/ui/Button.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.ui;
+package ch.asynk.gdx.board.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
diff --git a/core/src/ch/asynk/zproject/engine/ui/Element.java b/core/src/ch/asynk/gdx/board/ui/Element.java
index fc1d985..09523b5 100644
--- a/core/src/ch/asynk/zproject/engine/ui/Element.java
+++ b/core/src/ch/asynk/gdx/board/ui/Element.java
@@ -1,10 +1,10 @@
-package ch.asynk.gdx.board.engine.ui;
+package ch.asynk.gdx.board.ui;
 
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.math.Rectangle;
 
-import ch.asynk.gdx.board.engine.Drawable;
-import ch.asynk.gdx.board.engine.Touchable;
+import ch.asynk.gdx.board.Drawable;
+import ch.asynk.gdx.board.Touchable;
 
 public abstract class Element implements Drawable, Touchable
 {
diff --git a/core/src/ch/asynk/zproject/engine/ui/Label.java b/core/src/ch/asynk/gdx/board/ui/Label.java
index a2a60be..05dfc8c 100644
--- a/core/src/ch/asynk/zproject/engine/ui/Label.java
+++ b/core/src/ch/asynk/gdx/board/ui/Label.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.ui;
+package ch.asynk.gdx.board.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
diff --git a/core/src/ch/asynk/zproject/engine/ui/Patch.java b/core/src/ch/asynk/gdx/board/ui/Patch.java
index 10fecef..aa86c9f 100644
--- a/core/src/ch/asynk/zproject/engine/ui/Patch.java
+++ b/core/src/ch/asynk/gdx/board/ui/Patch.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.ui;
+package ch.asynk.gdx.board.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.NinePatch;
diff --git a/core/src/ch/asynk/zproject/engine/ui/Root.java b/core/src/ch/asynk/gdx/board/ui/Root.java
index 7cd2ba9..95d9ed5 100644
--- a/core/src/ch/asynk/zproject/engine/ui/Root.java
+++ b/core/src/ch/asynk/gdx/board/ui/Root.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.ui;
+package ch.asynk.gdx.board.ui;
 
 public class Root extends Assembly
 {
diff --git a/core/src/ch/asynk/zproject/engine/util/Collection.java b/core/src/ch/asynk/gdx/board/util/Collection.java
index 426bae8..8aadadf 100644
--- a/core/src/ch/asynk/zproject/engine/util/Collection.java
+++ b/core/src/ch/asynk/gdx/board/util/Collection.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.util;
+package ch.asynk.gdx.board.util;
 
 import java.util.Iterator;
 
diff --git a/core/src/ch/asynk/zproject/engine/util/IterableArray.java b/core/src/ch/asynk/gdx/board/util/IterableArray.java
index 446dd1b..2dc4481 100644
--- a/core/src/ch/asynk/zproject/engine/util/IterableArray.java
+++ b/core/src/ch/asynk/gdx/board/util/IterableArray.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.util;
+package ch.asynk.gdx.board.util;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/core/src/ch/asynk/zproject/engine/util/IterableQueue.java b/core/src/ch/asynk/gdx/board/util/IterableQueue.java
index 1c952d3..8a9a74f 100644
--- a/core/src/ch/asynk/zproject/engine/util/IterableQueue.java
+++ b/core/src/ch/asynk/gdx/board/util/IterableQueue.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.util;
+package ch.asynk.gdx.board.util;
 
 public class IterableQueue<E> extends IterableArray<E>
 {
diff --git a/core/src/ch/asynk/zproject/engine/util/IterableSet.java b/core/src/ch/asynk/gdx/board/util/IterableSet.java
index d28cf28..7e37f4e 100644
--- a/core/src/ch/asynk/zproject/engine/util/IterableSet.java
+++ b/core/src/ch/asynk/gdx/board/util/IterableSet.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.util;
+package ch.asynk.gdx.board.util;
 
 public class IterableSet<E> extends IterableArray<E>
 {
diff --git a/core/src/ch/asynk/zproject/engine/util/IterableStack.java b/core/src/ch/asynk/gdx/board/util/IterableStack.java
index d62daaa..1365408 100644
--- a/core/src/ch/asynk/zproject/engine/util/IterableStack.java
+++ b/core/src/ch/asynk/gdx/board/util/IterableStack.java
@@ -1,4 +1,4 @@
-package ch.asynk.gdx.board.engine.util;
+package ch.asynk.gdx.board.util;
 
 public class IterableStack<E> extends IterableArray<E>
 {