diff --git a/build.gradle b/build.gradle
index 59ae916aa4..ebfe1fb305 100644
--- a/build.gradle
+++ b/build.gradle
@@ -169,7 +169,9 @@ project(":core"){
         if(!comp) println("Note: Compiling release build.")
 
         if(new File(projectDir.parent, '../Arc').exists() && comp){
+            println(project(":Arc:extensions").subprojects)
             compile project(":Arc:core")
+            compile project(":Arc:extensions:freetype")
         }else{
             //TODO compile arc from jitpack
             //compile 'com.github.Anuken.Arc:arc:-SNAPSHOT'
diff --git a/core/src/io/anuke/mindustry/Mindustry.java b/core/src/io/anuke/mindustry/Mindustry.java
index c0ad31f3eb..753348b053 100644
--- a/core/src/io/anuke/mindustry/Mindustry.java
+++ b/core/src/io/anuke/mindustry/Mindustry.java
@@ -3,10 +3,8 @@ package io.anuke.mindustry;
 import io.anuke.arc.ApplicationListener;
 import io.anuke.arc.Core;
 import io.anuke.arc.Events;
-import io.anuke.arc.Settings;
-import io.anuke.arc.utils.Log;
-import io.anuke.arc.utils.Time;
-import io.anuke.arc.utils.TimeUtils;
+import io.anuke.arc.util.Log;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.game.EventType.GameLoadEvent;
 import io.anuke.mindustry.io.BundleLoader;
@@ -47,7 +45,7 @@ public class Mindustry implements ApplicationListener{
 
     @Override
     public void update(){
-        lastFrameTime = TimeUtils.millis();
+        lastFrameTime = Time.millis();
 
         //TODO ??render it all??
 
@@ -55,7 +53,7 @@ public class Mindustry implements ApplicationListener{
 
         if(fpsCap <= 120){
             long target = 1000/fpsCap;
-            long elapsed = TimeUtils.timeSinceMillis(lastFrameTime);
+            long elapsed = Time.timeSinceMillis(lastFrameTime);
             if(elapsed < target){
                 try{
                     Thread.sleep(target - elapsed);
diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index 4fa818fa9c..8a017eb548 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -17,7 +17,7 @@ import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.gen.Serialization;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity;
-import io.anuke.arc.core.Settings;
+import io.anuke.arc.Settings;
 import io.anuke.arc.entities.Entities;
 import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.entities.impl.EffectEntity;
diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java
index 3277e53e5c..0902c0546e 100644
--- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java
+++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java
@@ -1,7 +1,12 @@
 package io.anuke.mindustry.ai;
 
-import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.*;
+import io.anuke.arc.Events;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.function.Predicate;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.Vector2;
+import io.anuke.arc.util.Bits;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
@@ -11,12 +16,6 @@ import io.anuke.mindustry.game.Teams.TeamData;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.function.Predicate;
-import io.anuke.arc.util.EnumSet;
-import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
-import io.anuke.arc.util.ThreadArray;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -47,7 +46,7 @@ public class BlockIndexer{
     /**Empty set used for returning.*/
     private ObjectSet<Tile> emptySet = new ObjectSet<>();
     /**Array used for returning and reusing.*/
-    private Array<Tile> returnArray = new ThreadArray<>();
+    private Array<Tile> returnArray = new Array<>();
 
     public BlockIndexer(){
         Events.on(TileChangeEvent.class, event -> {
diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java
index ac7a07c727..73864f6773 100644
--- a/core/src/io/anuke/mindustry/ai/Pathfinder.java
+++ b/core/src/io/anuke/mindustry/ai/Pathfinder.java
@@ -1,9 +1,9 @@
 package io.anuke.mindustry.ai;
 
 import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.utils.IntArray;
-import io.anuke.arc.utils.Queue;
-import io.anuke.arc.utils.TimeUtils;
+import io.anuke.arc.util.IntArray;
+import io.anuke.arc.util.Queue;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
 import io.anuke.mindustry.game.Team;
@@ -11,8 +11,8 @@ import io.anuke.mindustry.game.Teams.TeamData;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Events;
+import io.anuke.arc.Timers;
 import io.anuke.arc.util.Geometry;
 import io.anuke.arc.util.Structs;
 
@@ -20,7 +20,7 @@ import static io.anuke.mindustry.Vars.state;
 import static io.anuke.mindustry.Vars.world;
 
 public class Pathfinder{
-    private long maxUpdate = TimeUtils.millisToNanos(4);
+    private long maxUpdate = Time.millisToNanos(4);
     private PathData[] paths;
     private IntArray blocked = new IntArray();
 
@@ -105,7 +105,7 @@ public class Pathfinder{
             //increment search, clear frontier
             path.search++;
             path.frontier.clear();
-            path.lastSearchTime = TimeUtils.millis();
+            path.lastSearchTime = Time.millis();
 
             //add all targets to the frontier
             for(Tile other : world.indexer.getEnemy(team, BlockFlag.target)){
@@ -144,9 +144,9 @@ public class Pathfinder{
     private void updateFrontier(Team team, long nsToRun){
         PathData path = paths[team.ordinal()];
 
-        long start = TimeUtils.nanoTime();
+        long start = Time.nanoTime();
 
-        while(path.frontier.size > 0 && (nsToRun < 0 || TimeUtils.timeSinceNanos(start) <= nsToRun)){
+        while(path.frontier.size > 0 && (nsToRun < 0 || Time.timeSinceNanos(start) <= nsToRun)){
             Tile tile = path.frontier.removeLast();
             float cost = path.weights[tile.x][tile.y];
 
diff --git a/core/src/io/anuke/mindustry/ai/WaveSpawner.java b/core/src/io/anuke/mindustry/ai/WaveSpawner.java
index 8a80641e57..d3eba71630 100644
--- a/core/src/io/anuke/mindustry/ai/WaveSpawner.java
+++ b/core/src/io/anuke/mindustry/ai/WaveSpawner.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.ai;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.units.BaseUnit;
 import io.anuke.mindustry.entities.units.Squad;
@@ -9,9 +9,9 @@ import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.game.Waves;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Events;
+import io.anuke.arc.Events;
 import io.anuke.arc.util.GridBits;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Structs;
 
 import java.io.DataInput;
diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java
index 839cfd1290..f77a844d88 100644
--- a/core/src/io/anuke/mindustry/content/Mechs.java
+++ b/core/src/io/anuke/mindustry/content/Mechs.java
@@ -17,12 +17,12 @@ import io.anuke.mindustry.maps.TutorialSector;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Mech;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Core;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.unitGroups;
 
@@ -137,7 +137,7 @@ public class Mechs implements ContentList{
 
                     rect.setSize(healRange*2f).setCenter(player.x, player.y);
                     Units.getNearby(player.getTeam(), rect, unit -> {
-                        if(unit.distanceTo(player) <= healRange){
+                        if(unit.dst(player) <= healRange){
                             if(unit.health < unit.maxHealth()){
                                 Effects.effect(UnitFx.heal, unit);
                                 wasHealed = true;
@@ -184,7 +184,7 @@ public class Mechs implements ContentList{
             @Override
             public void load(){
                 super.load();
-                armorRegion = Draw.region(name + "-armor");
+                armorRegion = Core.atlas.find(name + "-armor");
             }
 
             @Override
@@ -246,7 +246,7 @@ public class Mechs implements ContentList{
             @Override
             public void load(){
                 super.load();
-                shield = Draw.region(name + "-shield");
+                shield = Core.atlas.find(name + "-shield");
             }
 
             @Override
diff --git a/core/src/io/anuke/mindustry/content/StatusEffects.java b/core/src/io/anuke/mindustry/content/StatusEffects.java
index de817c5568..b6c3038088 100644
--- a/core/src/io/anuke/mindustry/content/StatusEffects.java
+++ b/core/src/io/anuke/mindustry/content/StatusEffects.java
@@ -6,9 +6,9 @@ import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.StatusEffect;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Timers;
+import io.anuke.arc.math.Mathf;
 
 public class StatusEffects implements ContentList{
     public static StatusEffect none, burning, freezing, wet, melting, tarred, overdrive, shielded, shocked;
diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java
index fa9e195734..5433e0c79d 100644
--- a/core/src/io/anuke/mindustry/content/UnitTypes.java
+++ b/core/src/io/anuke/mindustry/content/UnitTypes.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.content;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.entities.units.UnitType;
 import io.anuke.mindustry.entities.units.types.*;
 import io.anuke.mindustry.game.ContentList;
diff --git a/core/src/io/anuke/mindustry/content/blocks/Blocks.java b/core/src/io/anuke/mindustry/content/blocks/Blocks.java
index 87d863b07f..93d33b9f06 100644
--- a/core/src/io/anuke/mindustry/content/blocks/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/Blocks.java
@@ -10,10 +10,10 @@ import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.*;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class Blocks extends BlockList implements ContentList{
     public static Block air, blockpart, spawn, space, metalfloor, deepwater, water, lava, tar, stone,
diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
index e0e56e5d3f..5559275254 100644
--- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.blocks;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.Liquids;
diff --git a/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java b/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java
index c153bc70c8..515542e9fd 100644
--- a/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.blocks;
 
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.Floor;
diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
index 600f8d21e2..6a4aaf332b 100644
--- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
@@ -10,7 +10,7 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.defense.turrets.*;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class TurretBlocks extends BlockList implements ContentList{
     public static Block duo, /*scatter,*/
@@ -46,7 +46,7 @@ public class TurretBlocks extends BlockList implements ContentList{
             @Override
             public void load(){
                 super.load();
-                shootRegion = Draw.region(name + "-shoot");
+                shootRegion = Core.atlas.find(name + "-shoot");
             }
 
             {
@@ -137,8 +137,8 @@ public class TurretBlocks extends BlockList implements ContentList{
             @Override
             public void load() {
                 super.load();
-                panels[0] = Draw.region(name + "-panel-left");
-                panels[1] = Draw.region(name + "-panel-right");
+                panels[0] = Core.atlas.find(name + "-panel-left");
+                panels[1] = Core.atlas.find(name + "-panel-right");
             }
 
             {
diff --git a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java b/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java
index fcb4d41055..c13a5b8409 100644
--- a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java
@@ -7,7 +7,7 @@ import io.anuke.mindustry.entities.bullet.FlakBulletType;
 import io.anuke.mindustry.entities.effect.Lightning;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class FlakBullets extends BulletList implements ContentList{
     public static BulletType plastic, explosive, surge;
diff --git a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
index e5b2bc39d2..8b8c40a31a 100644
--- a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
@@ -8,8 +8,8 @@ import io.anuke.mindustry.entities.bullet.MissileBulletType;
 import io.anuke.mindustry.entities.effect.Lightning;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Timers;
+import io.anuke.arc.math.Mathf;
 
 public class MissileBullets extends BulletList implements ContentList{
     public static BulletType explosive, incindiary, surge, javelin, swarm;
diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
index 685613814e..36e4ebd499 100644
--- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
@@ -18,11 +18,11 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BuildBlock;
 import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.content;
 import static io.anuke.mindustry.Vars.world;
@@ -367,9 +367,9 @@ public class TurretBullets extends BulletList implements ContentList{
                     return;
                 }
 
-                float baseDst = data.from.distanceTo(data.to);
-                float dst1 = b.distanceTo(data.from);
-                float dst2 = b.distanceTo(data.to);
+                float baseDst = data.from.dst(data.to);
+                float dst1 = b.dst(data.from);
+                float dst2 = b.dst(data.to);
 
                 boolean intersect = false;
 
diff --git a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java
index 67d51f3899..86adce6b55 100644
--- a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java
@@ -12,7 +12,7 @@ import io.anuke.mindustry.entities.effect.Fire;
 import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.world;
 
diff --git a/core/src/io/anuke/mindustry/content/fx/BlockFx.java b/core/src/io/anuke/mindustry/content/fx/BlockFx.java
index 5155ae9d20..a5fc7f81ff 100644
--- a/core/src/io/anuke/mindustry/content/fx/BlockFx.java
+++ b/core/src/io/anuke/mindustry/content/fx/BlockFx.java
@@ -4,13 +4,13 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Hue;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Tmp;
 
 import static io.anuke.mindustry.Vars.tilesize;
diff --git a/core/src/io/anuke/mindustry/content/fx/BulletFx.java b/core/src/io/anuke/mindustry/content/fx/BulletFx.java
index dffe6b4357..572b38a280 100644
--- a/core/src/io/anuke/mindustry/content/fx/BulletFx.java
+++ b/core/src/io/anuke/mindustry/content/fx/BulletFx.java
@@ -3,12 +3,12 @@ package io.anuke.mindustry.content.fx;
 import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class BulletFx extends FxList implements ContentList{
     public static Effect hitBulletSmall, hitFuse, hitBulletBig, hitFlameSmall, hitLiquid, hitLaser, hitLancer, hitMeltdown, despawn, flakExplosion, blastExplosion, plasticExplosion,
diff --git a/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java b/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java
index 8dadc54f43..abd76acf28 100644
--- a/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java
+++ b/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java
@@ -1,15 +1,14 @@
 package io.anuke.mindustry.content.fx;
 
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.graphics.g2d.Fill;
+import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.type.Item;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.graphics.Fill;
-import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
 
 public class EnvironmentFx extends FxList implements ContentList{
     public static Effect burning, fire, smoke, steam, fireballsmoke, ballfire, freezing, melting, wet, oily, overdriven, dropItem;
diff --git a/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java b/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java
index e0f16caa55..850e489acd 100644
--- a/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java
+++ b/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java
@@ -3,12 +3,12 @@ package io.anuke.mindustry.content.fx;
 import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class ExplosionFx extends FxList implements ContentList{
     public static Effect shockwave, bigShockwave, nuclearShockwave, explosion, blockExplosion, blockExplosionSmoke;
diff --git a/core/src/io/anuke/mindustry/content/fx/Fx.java b/core/src/io/anuke/mindustry/content/fx/Fx.java
index 9879a13b86..7e3e05b4f4 100644
--- a/core/src/io/anuke/mindustry/content/fx/Fx.java
+++ b/core/src/io/anuke/mindustry/content/fx/Fx.java
@@ -3,7 +3,7 @@ package io.anuke.mindustry.content.fx;
 import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Lines;
diff --git a/core/src/io/anuke/mindustry/content/fx/ShootFx.java b/core/src/io/anuke/mindustry/content/fx/ShootFx.java
index 9d7a8b37af..96abca972e 100644
--- a/core/src/io/anuke/mindustry/content/fx/ShootFx.java
+++ b/core/src/io/anuke/mindustry/content/fx/ShootFx.java
@@ -4,13 +4,13 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.graphics.Shapes;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class ShootFx extends FxList implements ContentList{
     public static Effect shootSmall, shootHeal, shootSmallSmoke, shootBig, shootBig2, shootBigSmoke, shootBigSmoke2, shootSmallFlame, shootLiquid, shellEjectSmall, shellEjectMedium, shellEjectBig, lancerLaserShoot, lancerLaserShootSmoke, lancerLaserCharge, lancerLaserChargeBegin, lightningCharge, lightningShoot;
diff --git a/core/src/io/anuke/mindustry/content/fx/UnitFx.java b/core/src/io/anuke/mindustry/content/fx/UnitFx.java
index a8850b30ce..280b6080b8 100644
--- a/core/src/io/anuke/mindustry/content/fx/UnitFx.java
+++ b/core/src/io/anuke/mindustry/content/fx/UnitFx.java
@@ -3,12 +3,12 @@ package io.anuke.mindustry.content.fx;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class UnitFx extends FxList implements ContentList{
     public static Effect vtolHover, unitDrop, unitPickup, unitLand, pickup, healWave, heal, landShock;
diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java
index 4d4c25bacc..dfd6091b00 100644
--- a/core/src/io/anuke/mindustry/core/ContentLoader.java
+++ b/core/src/io/anuke/mindustry/core/ContentLoader.java
@@ -4,7 +4,7 @@ import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.ObjectMap;
 import io.anuke.arc.collection.ObjectSet;
 import io.anuke.arc.function.Consumer;
-import io.anuke.arc.utils.Log;
+import io.anuke.arc.util.Log;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.content.blocks.*;
 import io.anuke.mindustry.content.bullets.*;
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 20d35591e2..35220d52a2 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -3,15 +3,14 @@ package io.anuke.mindustry.core;
 import io.anuke.arc.ApplicationListener;
 import io.anuke.arc.Core;
 import io.anuke.arc.Events;
-import io.anuke.arc.Settings;
 import io.anuke.arc.entities.Effects;
 import io.anuke.arc.entities.EntityQuery;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureAtlas;
 import io.anuke.arc.input.KeyCode;
-import io.anuke.arc.utils.Interval;
-import io.anuke.arc.utils.Strings;
-import io.anuke.arc.utils.Time;
+import io.anuke.arc.util.Interval;
+import io.anuke.arc.util.Strings;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Mechs;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Player;
@@ -95,7 +94,7 @@ public class Control implements ApplicationListener{
             state.set(State.playing);
         });
 
-        Events.on(WorldLoadGraphicsEvent.class, event -> {
+        Events.on(WorldLoadEvent.class, event -> {
             if(mobile){
                 Core.app.post(() -> Core.camera.position.set(players[0]));
             }
@@ -146,8 +145,6 @@ public class Control implements ApplicationListener{
                 }
             }
         });
-
-        Events.on(WorldLoadEvent.class, event -> threads.runGraphics(() -> Events.fire(new WorldLoadGraphicsEvent())));
     }
 
     public void addPlayer(int index){
diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/io/anuke/mindustry/core/GameState.java
index 6d9e71b2e7..4d795a46fc 100644
--- a/core/src/io/anuke/mindustry/core/GameState.java
+++ b/core/src/io/anuke/mindustry/core/GameState.java
@@ -5,7 +5,7 @@ import io.anuke.mindustry.game.EventType.StateChangeEvent;
 import io.anuke.mindustry.game.GameMode;
 import io.anuke.mindustry.game.Teams;
 import io.anuke.mindustry.net.Net;
-import io.anuke.arc.core.Events;
+import io.anuke.arc.Events;
 
 import static io.anuke.mindustry.Vars.unitGroups;
 import static io.anuke.mindustry.Vars.waveTeam;
diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java
index 97bc5de319..cd24fdca7f 100644
--- a/core/src/io/anuke/mindustry/core/Logic.java
+++ b/core/src/io/anuke/mindustry/core/Logic.java
@@ -1,8 +1,14 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.arc.utils.Array;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
+import io.anuke.arc.ApplicationListener;
+import io.anuke.arc.Events;
+import io.anuke.arc.entities.Entities;
+import io.anuke.arc.entities.EntityGroup;
+import io.anuke.arc.entities.EntityQuery;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.TileEntity;
@@ -16,12 +22,6 @@ import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.type.Recipe;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.entities.Entities;
-import io.anuke.arc.entities.EntityGroup;
-import io.anuke.arc.entities.EntityQuery;
-import io.anuke.arc.modules.Module;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -33,7 +33,7 @@ import static io.anuke.mindustry.Vars.*;
  * <p>
  * This class should <i>not</i> call any outside methods to change state of modules, but instead fire events.
  */
-public class Logic extends Module{
+public class Logic implements ApplicationListener{
 
     public Logic(){
         Events.on(TileChangeEvent.class, event -> {
@@ -141,7 +141,7 @@ public class Logic extends Module{
 
     @Remote(called = Loc.both)
     public static void onGameOver(Team winner){
-        threads.runGraphics(() -> ui.restart.show(winner));
+        ui.restart.show(winner);
         netClient.setQuiet();
     }
 
diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java
index 6efafcb511..78c6e670e4 100644
--- a/core/src/io/anuke/mindustry/core/NetClient.java
+++ b/core/src/io/anuke/mindustry/core/NetClient.java
@@ -1,14 +1,21 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.Base64Coder;
-import io.anuke.arc.utils.IntSet;
-import io.anuke.arc.utils.TimeUtils;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.PacketPriority;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.annotations.Annotations.Variant;
+import io.anuke.arc.ApplicationListener;
+import io.anuke.arc.Core;
+import io.anuke.arc.collection.IntSet;
+import io.anuke.arc.entities.Entities;
+import io.anuke.arc.entities.EntityGroup;
+import io.anuke.arc.graphics.Color;
+import io.anuke.arc.util.Interval;
+import io.anuke.arc.util.io.ReusableByteArrayInputStream;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.util.Log;
+import io.anuke.arc.util.Time;
+import io.anuke.arc.util.serialization.Base64Coder;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Player;
@@ -25,16 +32,6 @@ import io.anuke.mindustry.net.Packets.*;
 import io.anuke.mindustry.net.ValidateException;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.modules.ItemModule;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Settings;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.entities.Entities;
-import io.anuke.arc.entities.EntityGroup;
-import io.anuke.arc.io.ReusableByteArrayInputStream;
-import io.anuke.arc.modules.Module;
-import io.anuke.arc.util.Log;
-import io.anuke.arc.util.Mathf;
-import io.anuke.arc.util.Timer;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -43,12 +40,12 @@ import java.util.zip.InflaterInputStream;
 
 import static io.anuke.mindustry.Vars.*;
 
-public class NetClient extends Module{
+public class NetClient implements ApplicationListener{
     private final static float dataTimeout = 60 * 18;
     private final static float playerSyncTime = 2;
     public final static float viewScale = 2f;
 
-    private Timer timer = new Timer(5);
+    private Interval timer = new Interval(5);
     /**Whether the client is currently connecting.*/
     private boolean connecting = false;
     /**If true, no message will be shown on disconnect.*/
@@ -422,13 +419,13 @@ public class NetClient extends Module{
                 requests[i] = player.getPlaceQueue().get(i);
             }
 
-            Call.onClientShapshot(lastSent++, TimeUtils.millis(), player.x, player.y,
+            Call.onClientShapshot(lastSent++, Time.millis(), player.x, player.y,
                 player.pointerX, player.pointerY, player.rotation, player.baseRotation,
                 player.getVelocity().x, player.getVelocity().y,
                 player.getMineTile(),
                 player.isBoosting, player.isShooting, requests,
                 Core.camera.position.x, Core.camera.position.y,
-                Core.camera.viewportWidth * Core.camera.zoom * viewScale, Core.camera.viewportHeight * Core.camera.zoom * viewScale);
+                Core.camera.width * viewScale, Core.camera.height * viewScale);
         }
 
         if(timer.get(1, 60)){
@@ -443,7 +440,7 @@ public class NetClient extends Module{
             byte[] bytes = new byte[8];
             new Random().nextBytes(bytes);
             String result = new String(Base64Coder.encode(bytes));
-            Core.settings.putString("usid-" + ip, result);
+            Core.settings.put("usid-" + ip, result);
             Core.settings.save();
             return result;
         }
diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index 0978b87899..86fcf99451 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -1,15 +1,26 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.Colors;
-import io.anuke.arc.math.Rectangle;
-import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntMap;
-import io.anuke.arc.utils.ObjectSet;
-import io.anuke.arc.utils.TimeUtils;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
+import io.anuke.arc.ApplicationListener;
+import io.anuke.arc.Events;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.IntMap;
+import io.anuke.arc.collection.ObjectSet;
+import io.anuke.arc.entities.Entities;
+import io.anuke.arc.entities.EntityGroup;
+import io.anuke.arc.entities.EntityQuery;
+import io.anuke.arc.entities.trait.Entity;
+import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.Colors;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.Rectangle;
+import io.anuke.arc.math.geom.Vector2;
+import io.anuke.arc.util.Log;
+import io.anuke.arc.util.Structs;
+import io.anuke.arc.util.Time;
+import io.anuke.arc.util.io.ByteBufferOutput;
+import io.anuke.arc.util.io.CountableByteArrayOutputStream;
 import io.anuke.mindustry.content.Mechs;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.core.GameState.State;
@@ -21,22 +32,13 @@ import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.gen.RemoteReadServer;
-import io.anuke.mindustry.net.*;
+import io.anuke.mindustry.net.Administration;
 import io.anuke.mindustry.net.Administration.PlayerInfo;
+import io.anuke.mindustry.net.Net;
+import io.anuke.mindustry.net.NetConnection;
+import io.anuke.mindustry.net.NetworkIO;
 import io.anuke.mindustry.net.Packets.*;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.entities.Entities;
-import io.anuke.arc.entities.EntityGroup;
-import io.anuke.arc.entities.EntityQuery;
-import io.anuke.arc.entities.trait.Entity;
-import io.anuke.arc.io.ByteBufferOutput;
-import io.anuke.arc.io.CountableByteArrayOutputStream;
-import io.anuke.arc.modules.Module;
-import io.anuke.arc.util.Structs;
-import io.anuke.arc.util.Log;
-import io.anuke.arc.util.Mathf;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -48,7 +50,7 @@ import java.util.zip.DeflaterOutputStream;
 
 import static io.anuke.mindustry.Vars.*;
 
-public class NetServer extends Module{
+public class NetServer implements ApplicationListener{
     public final static int maxSnapshotSize = 2047;
 
     public final static boolean debugSnapshots = false;
@@ -122,7 +124,7 @@ public class NetServer extends Module{
                 return;
             }
 
-            if(TimeUtils.millis() - info.lastKicked < kickDuration){
+            if(Time.millis() - info.lastKicked < kickDuration){
                 kick(id, KickReason.recentKick);
                 return;
             }
@@ -311,14 +313,14 @@ public class NetServer extends Module{
 
         boolean verifyPosition = !player.isDead() && netServer.admins.getStrict() && headless && player.getCarrier() == null;
 
-        if(connection.lastRecievedClientTime == 0) connection.lastRecievedClientTime = TimeUtils.millis() - 16;
+        if(connection.lastRecievedClientTime == 0) connection.lastRecievedClientTime = Time.millis() - 16;
 
         connection.viewX = viewX;
         connection.viewY = viewY;
         connection.viewWidth = viewWidth;
         connection.viewHeight = viewHeight;
 
-        long elapsed = TimeUtils.timeSinceMillis(connection.lastRecievedClientTime);
+        long elapsed = Time.timeSinceMillis(connection.lastRecievedClientTime);
 
         float maxSpeed = boosting && !player.mech.flying ? player.mech.boostSpeed : player.mech.speed;
         float maxMove = elapsed / 1000f * 60f * Math.min(compound(maxSpeed, player.mech.drag) * 1.25f, player.mech.maxSpeed * 1.1f);
@@ -370,7 +372,7 @@ public class NetServer extends Module{
         player.getVelocity().set(xVelocity, yVelocity); //only for visual calculation purposes, doesn't actually update the player
 
         connection.lastRecievedClientSnapshot = snapshotID;
-        connection.lastRecievedClientTime = TimeUtils.millis();
+        connection.lastRecievedClientTime = Time.millis();
     }
 
     @Remote(targets = Loc.client, called = Loc.server)
@@ -436,7 +438,7 @@ public class NetServer extends Module{
 
         if(!headless && !closing && Net.server() && state.is(State.menu)){
             closing = true;
-            threads.runGraphics(() -> ui.loadfrag.show("$text.server.closing"));
+            ui.loadfrag.show("$text.server.closing");
             Time.runTask(5f, () -> {
                 Net.closeServer();
                 ui.loadfrag.hide();
@@ -469,7 +471,7 @@ public class NetServer extends Module{
         if(player != null && (reason == KickReason.kick || reason == KickReason.banned) && player.uuid != null){
             PlayerInfo info = admins.getInfo(player.uuid);
             info.timesKicked++;
-            info.lastKicked = TimeUtils.millis();
+            info.lastKicked = Time.millis();
         }
 
         Call.onKick(connection, reason);
@@ -498,7 +500,7 @@ public class NetServer extends Module{
         }
 
         //write timestamp
-        dataStream.writeLong(TimeUtils.millis());
+        dataStream.writeLong(Time.millis());
 
         int totalGroups = 0;
 
diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java
index 6616a8e557..96a48c7cf8 100644
--- a/core/src/io/anuke/mindustry/core/Platform.java
+++ b/core/src/io/anuke/mindustry/core/Platform.java
@@ -1,15 +1,13 @@
 package io.anuke.mindustry.core;
 
 import io.anuke.arc.Core;
-import io.anuke.arc.Input.Keys;
 import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.utils.Base64Coder;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Settings;
-import io.anuke.arc.core.Timers;
 import io.anuke.arc.function.Consumer;
+import io.anuke.arc.input.KeyCode;
 import io.anuke.arc.scene.ui.Dialog;
 import io.anuke.arc.scene.ui.TextField;
+import io.anuke.arc.util.Time;
+import io.anuke.arc.util.serialization.Base64Coder;
 
 import java.util.Random;
 
@@ -44,7 +42,7 @@ public abstract class Platform {
 
             TextField to = dialog.content().addField(field.getText(), t-> {}).pad(15).width(250f).get();
             to.setMaxLength(maxLength);
-            to.keyDown(Keys.ENTER, () -> dialog.content().find("okb").fireClick());
+            to.keyDown(KeyCode.ENTER, () -> dialog.content().find("okb").fireClick());
 
             use[0] = to;
 
@@ -81,7 +79,7 @@ public abstract class Platform {
             byte[] result = new byte[8];
             new Random().nextBytes(result);
             uuid = new String(Base64Coder.encode(result));
-            Core.settings.putString("uuid", uuid);
+            Core.settings.put("uuid", uuid);
             Core.settings.save();
             return uuid;
         }
diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index 47ca4db461..c00429fe59 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -8,9 +8,9 @@ import io.anuke.arc.graphics.PixmapIO;
 import io.anuke.arc.graphics.g2d.SpriteBatch;
 import io.anuke.arc.math.Rectangle;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.BufferUtils;
-import io.anuke.arc.utils.ScreenUtils;
-import io.anuke.arc.utils.TimeUtils;
+import io.anuke.arc.util.BufferUtils;
+import io.anuke.arc.util.ScreenUtils;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Player;
@@ -23,10 +23,8 @@ import io.anuke.mindustry.entities.units.BaseUnit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Settings;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.entities.EntityDraw;
 import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.entities.impl.EffectEntity;
@@ -40,7 +38,7 @@ import io.anuke.arc.graphics.Surface;
 import io.anuke.arc.modules.RendererModule;
 import io.anuke.arc.scene.utils.Cursors;
 import io.anuke.arc.util.Bundles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Pooling;
 import io.anuke.arc.util.Translator;
 
@@ -415,7 +413,7 @@ public class Renderer extends RendererModule{
         Pixmap fullPixmap = new Pixmap(w, h, Pixmap.Format.RGBA8888);
 
         BufferUtils.copy(lines, 0, fullPixmap.getPixels(), lines.length);
-        FileHandle file = screenshotDirectory.child("screenshot-" + TimeUtils.millis() + ".png");
+        FileHandle file = screenshotDirectory.child("screenshot-" + Time.millis() + ".png");
         PixmapIO.writePNG(file, fullPixmap);
         fullPixmap.dispose();
 
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index b63e5cc59f..92e6f5f2ae 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -1,24 +1,16 @@
 package io.anuke.mindustry.core;
 
+import io.anuke.arc.ApplicationListener;
 import io.anuke.arc.Core;
-import io.anuke.arc.Input.Keys;
+import io.anuke.arc.Events;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.function.Consumer;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.Colors;
 import io.anuke.arc.graphics.g2d.BitmapFont;
-import io.anuke.arc.graphics.g2d.freetype.FreeTypeFontGenerator;
-import io.anuke.arc.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
+import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.input.KeyCode;
 import io.anuke.arc.math.Interpolation;
-import io.anuke.arc.utils.Align;
-import io.anuke.mindustry.editor.MapEditorDialog;
-import io.anuke.mindustry.game.EventType.ResizeEvent;
-import io.anuke.mindustry.graphics.Palette;
-import io.anuke.mindustry.input.InputHandler;
-import io.anuke.mindustry.ui.dialogs.*;
-import io.anuke.mindustry.ui.fragments.*;
-import io.anuke.arc.core.*;
-import io.anuke.arc.function.Consumer;
-import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.modules.SceneModule;
 import io.anuke.arc.scene.Group;
 import io.anuke.arc.scene.Skin;
 import io.anuke.arc.scene.actions.Actions;
@@ -28,12 +20,21 @@ import io.anuke.arc.scene.ui.TextField.TextFieldFilter;
 import io.anuke.arc.scene.ui.TooltipManager;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.scene.ui.layout.Unit;
+import io.anuke.arc.util.Align;
 import io.anuke.arc.util.Strings;
+import io.anuke.arc.util.Time;
+import io.anuke.arc.freetype.*;
+import io.anuke.mindustry.editor.MapEditorDialog;
+import io.anuke.mindustry.game.EventType.ResizeEvent;
+import io.anuke.mindustry.graphics.Palette;
+import io.anuke.mindustry.input.InputHandler;
+import io.anuke.mindustry.ui.dialogs.*;
+import io.anuke.mindustry.ui.fragments.*;
 
-import static io.anuke.mindustry.Vars.*;
 import static io.anuke.arc.scene.actions.Actions.*;
+import static io.anuke.mindustry.Vars.*;
 
-public class UI extends SceneModule{
+public class UI implements ApplicationListener{
     private FreeTypeFontGenerator generator;
 
     public final MenuFragment menufrag = new MenuFragment();
@@ -172,10 +173,10 @@ public class UI extends SceneModule{
         sectors = new SectorsDialog();
         missions = new MissionDialog();
 
-        Group group = Core.scene.getRoot();
+        Group group = Core.scene.root;
 
         backfrag.build(group);
-        control.input(0).getFrag().build(Core.scene.getRoot());
+        control.input(0).getFrag().build(group);
         hudfrag.build(group);
         menufrag.build(group);
         chatfrag.container().build(group);
@@ -215,9 +216,9 @@ public class UI extends SceneModule{
     public void loadLogic(String text, Runnable call){
         loadfrag.show(text);
         Time.runTask(7f, () ->
-            threads.run(() -> {
+            Core.app.post(() -> {
                 call.run();
-                threads.runGraphics(loadfrag::hide);
+                loadfrag.hide();
             }));
     }
 
@@ -292,8 +293,8 @@ public class UI extends SceneModule{
             dialog.hide();
             confirmed.run();
         });
-        dialog.keyDown(Keys.ESCAPE, dialog::hide);
-        dialog.keyDown(Keys.BACK, dialog::hide);
+        dialog.keyDown(KeyCode.ESCAPE, dialog::hide);
+        dialog.keyDown(KeyCode.BACK, dialog::hide);
         dialog.show();
     }
 
diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java
index c1cb55ea7e..acbe89f411 100644
--- a/core/src/io/anuke/mindustry/core/World.java
+++ b/core/src/io/anuke/mindustry/core/World.java
@@ -1,8 +1,16 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.ApplicationListener;
+import io.anuke.arc.Core;
+import io.anuke.arc.Events;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.ObjectMap;
+import io.anuke.arc.entities.EntityQuery;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.GridPoint2;
+import io.anuke.arc.util.Log;
+import io.anuke.arc.util.Structs;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.ai.BlockIndexer;
 import io.anuke.mindustry.ai.Pathfinder;
 import io.anuke.mindustry.ai.WaveSpawner;
@@ -18,15 +26,10 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Pos;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.OreBlock;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.entities.EntityQuery;
-import io.anuke.arc.modules.Module;
-import io.anuke.arc.util.*;
 
 import static io.anuke.mindustry.Vars.*;
 
-public class World extends Module{
+public class World implements ApplicationListener{
     public final Maps maps = new Maps();
     public final Sectors sectors = new Sectors();
     public final WorldGenerator generator = new WorldGenerator();
@@ -38,7 +41,7 @@ public class World extends Module{
     private Sector currentSector;
     private Tile[][] tiles;
 
-    private Array<Tile> tempTiles = new ThreadArray<>();
+    private Array<Tile> tempTiles = new Array<>();
     private boolean generating, invalidMap;
 
     public World(){
@@ -121,11 +124,11 @@ public class World extends Module{
     }
 
     public Tile tileWorld(float x, float y){
-        return tile(Mathf.scl2(x, tilesize), Mathf.scl2(y, tilesize));
+        return tile(Math.round(x / tilesize), Math.round(y / tilesize));
     }
 
     public int toTile(float coord){
-        return Mathf.scl2(coord, tilesize);
+        return Math.round(coord / tilesize);
     }
 
     public Tile[][] getTiles(){
@@ -335,8 +338,8 @@ public class World extends Module{
      * Raycast, but with world coordinates.
      */
     public GridPoint2 raycastWorld(float x, float y, float x2, float y2){
-        return raycast(Mathf.scl2(x, tilesize), Mathf.scl2(y, tilesize),
-                Mathf.scl2(x2, tilesize), Mathf.scl2(y2, tilesize));
+        return raycast(Math.round(x / tilesize), Math.round(y / tilesize),
+                Math.round(x2 / tilesize), Math.round(y2 / tilesize));
     }
 
     /**
diff --git a/core/src/io/anuke/mindustry/editor/DrawOperation.java b/core/src/io/anuke/mindustry/editor/DrawOperation.java
index ed5b95bcef..228728157c 100755
--- a/core/src/io/anuke/mindustry/editor/DrawOperation.java
+++ b/core/src/io/anuke/mindustry/editor/DrawOperation.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntSet;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.IntSet;
 import io.anuke.mindustry.maps.MapTileData;
 import io.anuke.mindustry.maps.MapTileData.TileDataMarker;
 import io.anuke.arc.util.Bits;
diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java
index 4117fb6746..f60863cad8 100644
--- a/core/src/io/anuke/mindustry/editor/EditorTool.java
+++ b/core/src/io/anuke/mindustry/editor/EditorTool.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.utils.IntArray;
+import io.anuke.arc.util.IntArray;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.maps.MapTileData;
 import io.anuke.mindustry.maps.MapTileData.DataPosition;
diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java
index 7a873307c6..64e4d64182 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditor.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditor.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.editor.DrawOperation.TileOperation;
@@ -12,7 +12,7 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.arc.util.Structs;
 import io.anuke.arc.util.Bits;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import static io.anuke.mindustry.Vars.content;
 public class MapEditor{
     public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15};
diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
index 83702fb54e..f467c889de 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
@@ -7,9 +7,9 @@ import io.anuke.arc.graphics.Pixmap;
 import io.anuke.arc.graphics.g2d.Batch;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Align;
-import io.anuke.arc.utils.Disposable;
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.util.Align;
+import io.anuke.arc.util.Disposable;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.blocks.StorageBlocks;
 import io.anuke.mindustry.core.Platform;
@@ -21,10 +21,9 @@ import io.anuke.mindustry.maps.MapTileData;
 import io.anuke.mindustry.type.Recipe;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
 import io.anuke.mindustry.world.Block;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Inputs;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Inputs;
+import io.anuke.arc.Timers;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.input.Input;
@@ -36,7 +35,7 @@ import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.scene.utils.UIUtils;
 import io.anuke.arc.util.Bundles;
 import io.anuke.arc.util.Log;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Strings;
 
 import java.io.DataInputStream;
@@ -476,35 +475,35 @@ public class MapEditorDialog extends Dialog implements Disposable{
     private void doInput(){
         //tool select
         for(int i = 0; i < EditorTool.values().length; i++){
-            if(Inputs.keyTap(Input.valueOf("NUM_" + (i + 1)))){
+            if(Core.input.keyTap(Input.valueOf("NUM_" + (i + 1)))){
                 view.setTool(EditorTool.values()[i]);
                 break;
             }
         }
 
-        if(Inputs.keyTap(Input.R)){
+        if(Core.input.keyTap(Input.R)){
             editor.setDrawRotation((editor.getDrawRotation() + 1) % 4);
         }
 
-        if(Inputs.keyTap(Input.E)){
+        if(Core.input.keyTap(Input.E)){
             editor.setDrawRotation(Mathf.mod((editor.getDrawRotation() + 1), 4));
         }
 
         //ctrl keys (undo, redo, save)
         if(UIUtils.ctrl()){
-            if(Inputs.keyTap(Input.Z)){
+            if(Core.input.keyTap(Input.Z)){
                 view.undo();
             }
 
-            if(Inputs.keyTap(Input.Y)){
+            if(Core.input.keyTap(Input.Y)){
                 view.redo();
             }
 
-            if(Inputs.keyTap(Input.S)){
+            if(Core.input.keyTap(Input.S)){
                 save();
             }
 
-            if(Inputs.keyTap(Input.G)){
+            if(Core.input.keyTap(Input.G)){
                 view.setGrid(!view.isGrid());
             }
         }
@@ -539,7 +538,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 continue;
             }
 
-            if(regions.length == 0 || regions[0] == Draw.region("jjfgj")) continue;
+            if(regions.length == 0 || regions[0] == Core.atlas.find("jjfgj")) continue;
 
             Stack stack = new Stack();
 
diff --git a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java
index 14ba9ea2c3..e14f63b95d 100644
--- a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java
@@ -1,9 +1,9 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
-import io.anuke.arc.core.Settings;
+import io.anuke.arc.Settings;
 import io.anuke.arc.scene.ui.TextArea;
 import io.anuke.arc.scene.ui.TextField;
 
diff --git a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java
index 37a5ad9257..cd6881901e 100644
--- a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.utils.Scaling;
+import io.anuke.arc.util.Scaling;
 import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.ui.BorderImage;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java
index 036eea3bfa..a2af5f492c 100644
--- a/core/src/io/anuke/mindustry/editor/MapRenderer.java
+++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java
@@ -3,14 +3,14 @@ package io.anuke.mindustry.editor;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.utils.Disposable;
-import io.anuke.arc.utils.IntSet;
-import io.anuke.arc.utils.IntSet.IntSetIterator;
+import io.anuke.arc.util.Disposable;
+import io.anuke.arc.util.IntSet;
+import io.anuke.arc.util.IntSet.IntSetIterator;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.maps.MapTileData.DataPosition;
 import io.anuke.mindustry.world.Block;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Core;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.IndexedRenderer;
 import io.anuke.arc.util.Structs;
@@ -142,14 +142,14 @@ public class MapRenderer implements Disposable{
 
         if(wall.update || wall.destructible){
             mesh.setColor(team.color);
-            region = Draw.region("block-border");
+            region = Core.atlas.find("block-border");
         }else if(elev > 0 && check){
             mesh.setColor(tmpColor.fromHsv((360f * elev / 127f * 4f) % 360f, 0.5f + (elev / 4f) % 0.5f, 1f));
-            region = Draw.region("block-elevation");
+            region = Core.atlas.find("block-elevation");
         }else if(elev == -1){
-            region = Draw.region("block-slope");
+            region = Core.atlas.find("block-slope");
         }else{
-            region = Draw.region("clear");
+            region = Core.atlas.find("clear");
         }
 
         mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize + chunksize * chunksize, region,
diff --git a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java b/core/src/io/anuke/mindustry/editor/MapResizeDialog.java
index 77cd201a69..1b493f5daf 100644
--- a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapResizeDialog.java
@@ -6,7 +6,7 @@ import io.anuke.arc.function.BiConsumer;
 import io.anuke.arc.scene.ui.ButtonGroup;
 import io.anuke.arc.scene.ui.TextButton;
 import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class MapResizeDialog extends FloatingDialog{
     int[] validMapSizes = {200, 300, 400, 500};
diff --git a/core/src/io/anuke/mindustry/editor/MapView.java b/core/src/io/anuke/mindustry/editor/MapView.java
index d82e820b88..126cbcc88a 100644
--- a/core/src/io/anuke/mindustry/editor/MapView.java
+++ b/core/src/io/anuke/mindustry/editor/MapView.java
@@ -9,13 +9,13 @@ import io.anuke.arc.math.Bresenham2;
 import io.anuke.arc.math.GridPoint2;
 import io.anuke.arc.math.Rectangle;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.editor.DrawOperation.TileOperation;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.ui.GridImage;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Inputs;
+import io.anuke.arc.Core;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Inputs;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.scene.Element;
@@ -25,7 +25,7 @@ import io.anuke.arc.scene.event.Touchable;
 import io.anuke.arc.scene.ui.TextField;
 import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Tmp;
 
 import static io.anuke.mindustry.Vars.mobile;
@@ -60,7 +60,7 @@ public class MapView extends Element implements GestureListener{
             brushPolygons[i] = Geometry.pixelCircle(size, (index, x, y) -> Vector2.dst(x, y, index, index) <= index - 0.5f);
         }
 
-        Inputs.addProcessor(0, new GestureDetector(20, 0.5f, 2, 0.15f, this));
+        Core.input.addProcessor(0, new GestureDetector(20, 0.5f, 2, 0.15f, this));
         setTouchable(Touchable.enabled);
 
         addListener(new InputListener(){
@@ -214,16 +214,16 @@ public class MapView extends Element implements GestureListener{
         super.act(delta);
 
         if(Core.scene.getKeyboardFocus() == null || !(Core.scene.getKeyboardFocus() instanceof TextField) &&
-                !Inputs.keyDown(io.anuke.arc.input.Input.CONTROL_LEFT)){
-            float ax = Inputs.getAxis("move_x");
-            float ay = Inputs.getAxis("move_y");
+                !Core.input.keyDown(io.anuke.arc.input.Input.CONTROL_LEFT)){
+            float ax = Core.input.getAxis("move_x");
+            float ay = Core.input.getAxis("move_y");
             offsetx -= ax * 15f / zoom;
             offsety -= ay * 15f / zoom;
         }
 
         if(ui.editor.hasPane()) return;
 
-        zoom += Inputs.scroll() / 10f * zoom;
+        zoom += Core.input.scroll() / 10f * zoom;
         clampZoom();
     }
 
diff --git a/core/src/io/anuke/mindustry/editor/OperationStack.java b/core/src/io/anuke/mindustry/editor/OperationStack.java
index 6824083279..6de94ee165 100755
--- a/core/src/io/anuke/mindustry/editor/OperationStack.java
+++ b/core/src/io/anuke/mindustry/editor/OperationStack.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 
 public class OperationStack{
     private final static int maxSize = 10;
diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java
index 42905e4648..a4160ce405 100644
--- a/core/src/io/anuke/mindustry/entities/Damage.java
+++ b/core/src/io/anuke/mindustry/entities/Damage.java
@@ -13,12 +13,12 @@ import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.function.Predicate;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Physics;
 import io.anuke.arc.util.Translator;
 
@@ -160,7 +160,7 @@ public class Damage{
     /**Damages all entities and blocks in a radius that are enemies of the team.*/
     public static void damage(Team team, float x, float y, float radius, float damage){
         Consumer<Unit> cons = entity -> {
-            if(entity.team == team || entity.distanceTo(x, y) > radius){
+            if(entity.team == team || entity.dst(x, y) > radius){
                 return;
             }
             float amount = calculateDamage(x, y, entity.x, entity.y, radius, damage);
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index 283cc2dd9e..4ef166b13b 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -1,13 +1,26 @@
 package io.anuke.mindustry.entities;
 
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.GlyphLayout;
-import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.math.Rectangle;
-import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Queue;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
+import io.anuke.arc.Core;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.collection.Queue;
+import io.anuke.arc.entities.Effects;
+import io.anuke.arc.entities.EntityGroup;
+import io.anuke.arc.entities.EntityQuery;
+import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.graphics.g2d.GlyphLayout;
+import io.anuke.arc.graphics.g2d.Lines;
+import io.anuke.arc.graphics.g2d.TextureRegion;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.Rectangle;
+import io.anuke.arc.math.geom.Vector2;
+import io.anuke.arc.util.Bits;
+import io.anuke.arc.util.Interval;
+import io.anuke.arc.util.Time;
+import io.anuke.arc.util.Timer;
 import io.anuke.mindustry.content.Mechs;
 import io.anuke.mindustry.content.fx.UnitFx;
 import io.anuke.mindustry.entities.effect.ScorchDecal;
@@ -16,6 +29,7 @@ import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.graphics.Trail;
+import io.anuke.mindustry.input.Binding;
 import io.anuke.mindustry.io.TypeIO;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.net.NetConnection;
@@ -24,13 +38,6 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.mindustry.world.blocks.storage.CoreBlock.CoreEntity;
-import io.anuke.arc.core.*;
-import io.anuke.arc.entities.EntityGroup;
-import io.anuke.arc.entities.EntityQuery;
-import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.graphics.Hue;
-import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.*;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -63,7 +70,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
     public NetConnection con;
     public int playerIndex = 0;
     public boolean isLocal = false;
-    public Timer timer = new Timer(4);
+    public Interval timer = new Interval(4);
     public TargetTrait target;
     public TargetTrait moveTarget;
 
@@ -72,7 +79,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
     private Tile mining;
     private CarriableTrait carrying;
     private Trail trail = new Trail(12);
-    private Vector2 movement = new Translator();
+    private Vector2 movement = new Vector2();
     private boolean moved;
 
     //endregion
@@ -112,7 +119,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
     }
 
     @Override
-    public Timer getTimer(){
+    public Interval getTimer(){
         return timer;
     }
 
@@ -559,7 +566,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
     protected void updateMech(){
         Tile tile = world.tileWorld(x, y);
 
-        isBoosting = Inputs.keyDown("dash") && !mech.flying;
+        isBoosting = Core.input.keyDown("dash") && !mech.flying;
 
         //if player is in solid block
         if(tile != null && tile.solid()){
@@ -579,7 +586,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         }
 
         //drop from carrier on key press
-        if(!ui.chatfrag.chatOpen() && Inputs.keyTap("drop_unit")){
+        if(!ui.chatfrag.chatOpen() && Core.input.keyTap("drop_unit")){
             if(!mech.flying){
                 if(getCarrier() != null){
                     Call.dropSelf(this);
@@ -599,9 +606,9 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
 
         String section = control.input(playerIndex).section;
 
-        float xa = Inputs.getAxis(section, "move_x");
-        float ya = Inputs.getAxis(section, "move_y");
-        if(!Inputs.keyDown("gridMode")){
+        float xa = Core.input.axis(section, "move_x");
+        float ya = Core.input.axis(section, "move_y");
+        if(!Core.input.keyDown(Binding.gridMode)){
             movement.y += ya * speed;
             movement.x += xa * speed;
         }
@@ -619,7 +626,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
             }
             float prex = x, prey = y;
             updateVelocityStatus();
-            moved = distanceTo(prex, prey) > 0.001f;
+            moved = dst(prex, prey) > 0.001f;
         }else{
             velocity.setZero();
             x = Mathf.lerpDelta(x, getCarrier().getX(), 0.1f);
@@ -647,7 +654,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
 
     protected void updateFlying(){
         if(Units.invalidateTarget(target, this) && !(target instanceof TileEntity && ((TileEntity) target).damaged() && target.getTeam() == team &&
-        mech.canHeal && distanceTo(target) < getWeapon().getAmmo().getRange())){
+        mech.canHeal && dst(target) < getWeapon().getAmmo().getRange())){
             target = null;
         }
 
@@ -664,7 +671,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
                 velocity.setAngle(Mathf.slerpDelta(velocity.angle(), angleTo(moveTarget), 0.1f));
             }
 
-            if(distanceTo(moveTarget) < 2f){
+            if(dst(moveTarget) < 2f){
                 if(moveTarget instanceof CarriableTrait){
                     carry((CarriableTrait) moveTarget);
                 }else if(tapping){
@@ -687,7 +694,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         movement.set(targetX - x, targetY - y).limit(isBoosting && !mech.flying ? mech.boostSpeed : mech.speed);
         movement.setAngle(Mathf.slerp(movement.angle(), velocity.angle(), 0.05f));
 
-        if(distanceTo(targetX, targetY) < attractDst){
+        if(dst(targetX, targetY) < attractDst){
             movement.setZero();
         }
 
@@ -699,7 +706,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         rect.width += expansion * 2f;
         rect.height += expansion * 2f;
 
-        isBoosting = EntityQuery.collisions().overlapsTile(rect) || distanceTo(targetX, targetY) > 85f;
+        isBoosting = EntityQuery.collisions().overlapsTile(rect) || dst(targetX, targetY) > 85f;
 
         velocity.add(movement.scl(Time.delta()));
 
@@ -711,7 +718,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
 
         float lx = x, ly = y;
         updateVelocityStatus();
-        moved = distanceTo(lx, ly) > 0.001f && !isCarried();
+        moved = dst(lx, ly) > 0.001f && !isCarried();
 
         if(mech.flying){
             //hovering effect
@@ -731,7 +738,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
 
                         if(mech.canHeal && target == null){
                             target = Geometry.findClosest(x, y, world.indexer.getDamaged(Team.blue));
-                            if(target != null && distanceTo(target) > getWeapon().getAmmo().getRange()){
+                            if(target != null && dst(target) > getWeapon().getAmmo().getRange()){
                                 target = null;
                             }else if(target != null){
                                 target = ((Tile) target).entity;
@@ -743,7 +750,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
                         }
                     }
                 }else if(target.isValid() || (target instanceof TileEntity && ((TileEntity) target).damaged() && target.getTeam() == team &&
-                mech.canHeal && distanceTo(target) < getWeapon().getAmmo().getRange())){
+                mech.canHeal && dst(target) < getWeapon().getAmmo().getRange())){
                     //rotate toward and shoot the target
                     if(mech.turnCursor){
                         rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.2f);
diff --git a/core/src/io/anuke/mindustry/entities/Predict.java b/core/src/io/anuke/mindustry/entities/Predict.java
index 6e94d0620f..b41f9baf7d 100644
--- a/core/src/io/anuke/mindustry/entities/Predict.java
+++ b/core/src/io/anuke/mindustry/entities/Predict.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.entities;
 
 import io.anuke.arc.math.Vector2;
 import io.anuke.mindustry.entities.traits.TargetTrait;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 /**
  * Class for predicting shoot angles based on velocities of targets.
diff --git a/core/src/io/anuke/mindustry/entities/StatusController.java b/core/src/io/anuke/mindustry/entities/StatusController.java
index d08e32e23d..eeb290b829 100644
--- a/core/src/io/anuke/mindustry/entities/StatusController.java
+++ b/core/src/io/anuke/mindustry/entities/StatusController.java
@@ -1,12 +1,12 @@
 package io.anuke.mindustry.entities;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.entities.traits.Saveable;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.StatusEffect;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.util.Pooling;
 import io.anuke.arc.util.ThreadArray;
 import io.anuke.arc.util.Tmp;
diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java
index 86c69b2cfc..fa7e9046cd 100644
--- a/core/src/io/anuke/mindustry/entities/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/TileEntity.java
@@ -1,11 +1,18 @@
 package io.anuke.mindustry.entities;
 
-import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.ObjectSet;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.ObjectSet;
+import io.anuke.arc.entities.Effects;
+import io.anuke.arc.entities.EntityGroup;
+import io.anuke.arc.entities.impl.BaseEntity;
+import io.anuke.arc.entities.trait.HealthTrait;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.GridPoint2;
+import io.anuke.arc.math.geom.Vector2;
+import io.anuke.arc.util.Interval;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.traits.TargetTrait;
@@ -20,13 +27,6 @@ import io.anuke.mindustry.world.modules.ConsumeModule;
 import io.anuke.mindustry.world.modules.ItemModule;
 import io.anuke.mindustry.world.modules.LiquidModule;
 import io.anuke.mindustry.world.modules.PowerModule;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.entities.EntityGroup;
-import io.anuke.arc.entities.impl.BaseEntity;
-import io.anuke.arc.entities.trait.HealthTrait;
-import io.anuke.arc.util.Mathf;
-import io.anuke.arc.util.Timer;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -42,7 +42,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
     public static int sleepingEntities = 0;
 
     public Tile tile;
-    public Timer timer;
+    public Interval timer;
     public float health;
     public float timeScale = 1f, timeScaleDuration;
 
@@ -78,7 +78,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
 
         health = tile.block().health;
 
-        timer = new Timer(tile.block().timers);
+        timer = new Interval(tile.block().timers);
 
         if(added){
             add();
diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java
index fd9c50e7bd..1c3d4c6660 100644
--- a/core/src/io/anuke/mindustry/entities/Unit.java
+++ b/core/src/io/anuke/mindustry/entities/Unit.java
@@ -1,9 +1,20 @@
 package io.anuke.mindustry.entities;
 
+import io.anuke.arc.Core;
+import io.anuke.arc.entities.Effects;
+import io.anuke.arc.entities.impl.DestructibleEntity;
+import io.anuke.arc.entities.trait.DamageTrait;
+import io.anuke.arc.entities.trait.DrawTrait;
+import io.anuke.arc.entities.trait.SolidTrait;
 import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.g2d.Draw;
+import io.anuke.arc.graphics.g2d.Fill;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.math.Rectangle;
-import io.anuke.arc.math.Vector2;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.Rectangle;
+import io.anuke.arc.math.geom.Vector2;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.Team;
@@ -15,16 +26,6 @@ import io.anuke.mindustry.type.Weapon;
 import io.anuke.mindustry.world.Pos;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.Floor;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.entities.impl.DestructibleEntity;
-import io.anuke.arc.entities.trait.DamageTrait;
-import io.anuke.arc.entities.trait.DrawTrait;
-import io.anuke.arc.entities.trait.SolidTrait;
-import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.graphics.Fill;
-import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -194,7 +195,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
 
         Units.getNearby(queryRect, t -> {
             if(t == this || t.getCarrier() == this || getCarrier() == t || t.isFlying() != isFlying()) return;
-            float dst = distanceTo(t);
+            float dst = dst(t);
             moveVector.set(x, y).sub(t.getX(), t.getY()).setLength(1f * (1f - (dst / queryRect.getWidth())));
             applyImpulse(moveVector.x, moveVector.y);
         });
@@ -324,7 +325,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
     }
 
     public TextureRegion getPowerCellRegion(){
-        return Draw.region("power-cell");
+        return Core.atlas.find("power-cell");
     }
 
     public void drawAll(){
diff --git a/core/src/io/anuke/mindustry/entities/Units.java b/core/src/io/anuke/mindustry/entities/Units.java
index 3ef0c60ac6..708a5da3a4 100644
--- a/core/src/io/anuke/mindustry/entities/Units.java
+++ b/core/src/io/anuke/mindustry/entities/Units.java
@@ -1,18 +1,18 @@
 package io.anuke.mindustry.entities;
 
-import io.anuke.arc.math.Rectangle;
-import io.anuke.arc.math.Vector2;
+import io.anuke.arc.collection.EnumSet;
+import io.anuke.arc.entities.EntityGroup;
+import io.anuke.arc.entities.EntityQuery;
+import io.anuke.arc.function.Consumer;
+import io.anuke.arc.function.Predicate;
+import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.Rectangle;
+import io.anuke.arc.math.geom.Vector2;
 import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.mindustry.entities.units.BaseUnit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.entities.EntityGroup;
-import io.anuke.arc.entities.EntityQuery;
-import io.anuke.arc.function.Consumer;
-import io.anuke.arc.function.Predicate;
-import io.anuke.arc.util.EnumSet;
-import io.anuke.arc.util.Geometry;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -38,7 +38,7 @@ public class Units{
      * @return whether the target is invalid
      */
     public static boolean invalidateTarget(TargetTrait target, Team team, float x, float y, float range){
-        return target == null || (range != Float.MAX_VALUE && target.distanceTo(x, y) > range) || target.getTeam() == team || !target.isValid();
+        return target == null || (range != Float.MAX_VALUE && target.dst(x, y) > range) || target.getTeam() == team || !target.isValid();
     }
 
     /**See {@link #invalidateTarget(TargetTrait, Team, float, float, float)}*/
@@ -221,7 +221,7 @@ public class Units{
         EntityGroup<BaseUnit> group = unitGroups[team.ordinal()];
         if(!group.isEmpty()){
             EntityQuery.getNearby(group, rect, entity -> {
-                if(entity.distanceTo(x, y) <= radius){
+                if(entity.dst(x, y) <= radius){
                     cons.accept((Unit) entity);
                 }
             });
@@ -229,7 +229,7 @@ public class Units{
 
         //now check all players
         EntityQuery.getNearby(playerGroup, rect, player -> {
-            if(((Unit) player).team == team && player.distanceTo(x, y) <= radius){
+            if(((Unit) player).team == team && player.dst(x, y) <= radius){
                 cons.accept((Unit) player);
             }
         });
diff --git a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java
index 9d2b578f02..9ded4dc858 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java
@@ -1,8 +1,8 @@
 package io.anuke.mindustry.entities.bullet;
 
 import io.anuke.mindustry.content.fx.BulletFx;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 
 //TODO scale velocity depending on fslope()
diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java
index e56799f5a7..41c9158eec 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java
@@ -6,11 +6,11 @@ import io.anuke.mindustry.entities.Damage;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.mindustry.graphics.Palette;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 /**
  * A BulletType for most ammo-based bullets shot from turrets and units.
@@ -47,8 +47,8 @@ public class BasicBulletType extends BulletType{
 
     @Override
     public void load(){
-        backRegion = Draw.region(bulletSprite + "-back");
-        frontRegion = Draw.region(bulletSprite);
+        backRegion = Core.atlas.find(bulletSprite + "-back");
+        frontRegion = Core.atlas.find(bulletSprite);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
index 3825fb6a58..cccc62b7db 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
@@ -10,13 +10,13 @@ import io.anuke.mindustry.entities.traits.SyncTrait;
 import io.anuke.mindustry.entities.traits.TeamTrait;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.entities.impl.BulletEntity;
 import io.anuke.arc.entities.trait.Entity;
 import io.anuke.arc.entities.trait.SolidTrait;
 import io.anuke.arc.entities.trait.VelocityTrait;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Pooling;
 import io.anuke.arc.util.Timer;
 
diff --git a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java
index 61a34a3f47..6c4e0d00ca 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java
@@ -6,8 +6,8 @@ import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.StatusEffect;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.entities.impl.BaseBulletType;
 import io.anuke.arc.util.Translator;
 
diff --git a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java
index a85ac932e2..63cc9ae20a 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java
@@ -3,7 +3,7 @@ package io.anuke.mindustry.entities.bullet;
 import io.anuke.arc.math.Rectangle;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.entities.Units;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 
 public abstract class FlakBulletType extends BasicBulletType{
     protected static Rectangle rect = new Rectangle();
@@ -27,7 +27,7 @@ public abstract class FlakBulletType extends BasicBulletType{
             Units.getNearbyEnemies(b.getTeam(), rect.setSize(explodeRange*2f).setCenter(b.x, b.y), unit -> {
                 if(b.getData() instanceof Float) return;
 
-                if(unit.distanceTo(b) < explodeRange){
+                if(unit.dst(b) < explodeRange){
                     b.setData(0);
                     Time.run(5f, () -> {
                         if(b.getData() instanceof Integer){
diff --git a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java
index fc65f14008..22ffda5f63 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java
@@ -8,11 +8,11 @@ import io.anuke.mindustry.entities.effect.Fire;
 import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
+import io.anuke.arc.Effects;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.tilesize;
 import static io.anuke.mindustry.Vars.world;
diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
index 7e17680011..2b9ccbaec2 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
@@ -3,9 +3,9 @@ package io.anuke.mindustry.entities.bullet;
 import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.graphics.Palette;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Timers;
+import io.anuke.arc.math.Mathf;
 
 public class MissileBulletType extends BasicBulletType{
     protected Color trailColor = Palette.missileYellowBack;
diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java
index e4504f028a..8e299fba84 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Decal.java
+++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java
@@ -6,7 +6,7 @@ import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.entities.impl.TimedEntity;
 import io.anuke.arc.entities.trait.DrawTrait;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.groundEffectGroup;
 
diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java
index 6c261114fa..5fa3eafde2 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Fire.java
+++ b/core/src/io/anuke/mindustry/entities/effect/Fire.java
@@ -1,8 +1,8 @@
 package io.anuke.mindustry.entities.effect;
 
 import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.utils.IntMap;
-import io.anuke.arc.utils.Pool.Poolable;
+import io.anuke.arc.util.IntMap;
+import io.anuke.arc.util.Pool.Poolable;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.StatusEffects;
@@ -16,13 +16,13 @@ import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Timers;
 import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.entities.impl.TimedEntity;
 import io.anuke.arc.util.Structs;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Pooling;
 
 import java.io.DataInput;
diff --git a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java b/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
index d7f69f7510..43eb64e8a9 100644
--- a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
+++ b/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
@@ -2,12 +2,12 @@ package io.anuke.mindustry.entities.effect;
 
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
 import io.anuke.arc.entities.impl.EffectEntity;
-import io.anuke.arc.core.Effects.EffectRenderer;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Effects.EffectRenderer;
+import io.anuke.arc.math.Mathf;
 
 /**
  * A ground effect contains an effect that is rendered on the ground layer as opposed to the top layer.
diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
index 69ad25e106..bc502beecf 100644
--- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
+++ b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
@@ -11,9 +11,9 @@ import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.math.Interpolation;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Pooling;
-import io.anuke.arc.utils.Time;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.type.Item;
diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java
index 9f096ef9b7..2fa356a7f0 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java
+++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java
@@ -2,8 +2,8 @@ package io.anuke.mindustry.entities.effect;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.Rectangle;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntSet;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.IntSet;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.bullets.TurretBullets;
@@ -21,7 +21,6 @@ import io.anuke.arc.entities.trait.PosTrait;
 import io.anuke.arc.entities.trait.TimeTrait;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.*;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java
index be2ab5e2b6..9d8c454ef0 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java
+++ b/core/src/io/anuke/mindustry/entities/effect/Puddle.java
@@ -3,8 +3,8 @@ package io.anuke.mindustry.entities.effect;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.GridPoint2;
 import io.anuke.arc.math.Rectangle;
-import io.anuke.arc.utils.IntMap;
-import io.anuke.arc.utils.Pool.Poolable;
+import io.anuke.arc.util.IntMap;
+import io.anuke.arc.util.Pool.Poolable;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.Liquids;
@@ -19,8 +19,8 @@ import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Timers;
 import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.entities.impl.SolidEntity;
 import io.anuke.arc.entities.trait.DrawTrait;
@@ -29,7 +29,7 @@ import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Hue;
 import io.anuke.arc.util.Angles;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Pooling;
 
 import java.io.DataInput;
diff --git a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
index 7bc874d861..7d5d32694f 100644
--- a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
+++ b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.entities.effect;
 
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class RubbleDecal extends Decal{
     private int size;
diff --git a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
index fd5df78b11..0748f809fc 100644
--- a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
+++ b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
@@ -4,7 +4,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.world;
 
@@ -15,7 +15,7 @@ public class ScorchDecal extends Decal{
     public static void create(float x, float y){
         if(regions[0] == null){
             for(int i = 0; i < regions.length; i++){
-                regions[i] = Draw.region("scorch" + (i + 1));
+                regions[i] = Core.atlas.find("scorch" + (i + 1));
             }
         }
 
diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
index 1fb1aff758..af3a354644 100644
--- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
+++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
@@ -2,8 +2,8 @@ package io.anuke.mindustry.entities.traits;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.Queue;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.Queue;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.fx.BlockFx;
@@ -21,16 +21,16 @@ import io.anuke.mindustry.world.Pos;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BuildBlock;
 import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Events;
+import io.anuke.arc.Timers;
 import io.anuke.arc.entities.trait.Entity;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.graphics.Shapes;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -202,7 +202,7 @@ public interface BuilderTrait extends Entity{
 
         Tile tile = world.tile(current.x, current.y);
 
-        if(unit.distanceTo(tile) > placeDistance){
+        if(unit.dst(tile) > placeDistance){
             return;
         }
 
@@ -232,7 +232,7 @@ public interface BuilderTrait extends Entity{
             return;
         }
 
-        if(unit.distanceTo(tile) <= placeDistance){
+        if(unit.dst(tile) <= placeDistance){
             unit.rotation = Mathf.slerpDelta(unit.rotation, unit.angleTo(entity), 0.4f);
         }
 
@@ -261,7 +261,7 @@ public interface BuilderTrait extends Entity{
         Tile tile = getMineTile();
         TileEntity core = unit.getClosestCore();
 
-        if(core == null || tile.block() != Blocks.air || unit.distanceTo(tile.worldx(), tile.worldy()) > mineDistance
+        if(core == null || tile.block() != Blocks.air || unit.dst(tile.worldx(), tile.worldy()) > mineDistance
                 || tile.floor().drops == null || !unit.inventory.canAcceptItem(tile.floor().drops.item) || !canMine(tile.floor().drops.item)){
             setMineTile(null);
         }else{
@@ -270,7 +270,7 @@ public interface BuilderTrait extends Entity{
 
             if(Mathf.chance(Time.delta() * (0.06 - item.hardness * 0.01) * getMinePower())){
 
-                if(unit.distanceTo(core) < mineTransferRange && core.tile.block().acceptStack(item, 1, core.tile, unit) == 1){
+                if(unit.dst(core) < mineTransferRange && core.tile.block().acceptStack(item, 1, core.tile, unit) == 1){
                     Call.transferItemTo(item, 1,
                         tile.worldx() + Mathf.range(tilesize / 2f),
                         tile.worldy() + Mathf.range(tilesize / 2f), core.tile);
@@ -304,7 +304,7 @@ public interface BuilderTrait extends Entity{
 
         Tile tile = world.tile(request.x, request.y);
 
-        if(unit.distanceTo(tile) > placeDistance){
+        if(unit.dst(tile) > placeDistance){
             return;
         }
 
diff --git a/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java b/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java
index fe0efd79ee..fae4a77bb4 100644
--- a/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java
+++ b/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java
@@ -5,7 +5,7 @@ import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.fx.UnitFx;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.gen.Call;
-import io.anuke.arc.core.Effects;
+import io.anuke.arc.Effects;
 import io.anuke.arc.entities.trait.SolidTrait;
 
 public interface CarryTrait extends TeamTrait, SolidTrait, TargetTrait{
diff --git a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java b/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java
index a0d4ecee27..ec4fba0f5d 100644
--- a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java
+++ b/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.entities.traits;
 
 import io.anuke.mindustry.core.NetClient;
 import io.anuke.mindustry.net.Interpolator;
-import io.anuke.arc.core.Core;
+import io.anuke.arc.Core;
 import io.anuke.arc.entities.trait.Entity;
 import io.anuke.arc.util.Tmp;
 
diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java
index 54de336546..da1173a60a 100644
--- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java
+++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java
@@ -24,8 +24,8 @@ import io.anuke.mindustry.type.Weapon;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.units.CommandCenter.CommandCenterEntity;
 import io.anuke.mindustry.world.meta.BlockFlag;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Timers;
 import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.util.*;
diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
index 37d20ac539..65929cc530 100644
--- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
+++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
@@ -10,7 +10,7 @@ import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.util.*;
 
diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java
index 9c646a146e..067776e2a1 100644
--- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java
+++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java
@@ -12,10 +12,10 @@ import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Weapon;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.Floor;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Translator;
 
 import java.io.DataInput;
diff --git a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java
index 4b304ef6f1..25a20a5e45 100644
--- a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java
+++ b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java
@@ -5,7 +5,7 @@ import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.type.Item;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class UnitDrops{
     private static Item[] dropTable;
diff --git a/core/src/io/anuke/mindustry/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java
index 55ec6464a7..5f5ec46931 100644
--- a/core/src/io/anuke/mindustry/entities/units/UnitType.java
+++ b/core/src/io/anuke/mindustry/entities/units/UnitType.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.entities.units;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Weapons;
 import io.anuke.mindustry.entities.traits.TypeTrait;
@@ -78,12 +78,12 @@ public class UnitType extends UnlockableContent{
 
     @Override
     public void load(){
-        iconRegion = Draw.region("unit-icon-" + name);
-        region = Draw.region(name);
+        iconRegion = Core.atlas.find("unit-icon-" + name);
+        region = Core.atlas.find(name);
 
         if(!isFlying){
-            legRegion = Draw.region(name + "-leg");
-            baseRegion = Draw.region(name + "-base");
+            legRegion = Core.atlas.find(name + "-leg");
+            baseRegion = Core.atlas.find(name + "-base");
         }
     }
 
diff --git a/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java b/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java
index 0621869780..ca1b85eb13 100644
--- a/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java
+++ b/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java
@@ -15,8 +15,8 @@ import io.anuke.mindustry.entities.units.UnitState;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.AmmoType;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Effects;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/core/src/io/anuke/mindustry/entities/units/types/Drone.java b/core/src/io/anuke/mindustry/entities/units/types/Drone.java
index 8f0a7b0942..36a8ada290 100644
--- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java
+++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.units.types;
 
-import io.anuke.arc.utils.Queue;
+import io.anuke.arc.util.Queue;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.entities.TileEntity;
@@ -20,10 +20,10 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BuildBlock;
 import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
 import io.anuke.mindustry.world.meta.BlockFlag;
-import io.anuke.arc.core.Events;
+import io.anuke.arc.Events;
 import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Structs;
 
 import java.io.DataInput;
@@ -108,7 +108,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
 
             if(target == null) return;
 
-            if(target.distanceTo(Drone.this) > type.range){
+            if(target.dst(Drone.this) > type.range){
                 circle(type.range*0.9f);
             }else{
                 getWeapon().update(Drone.this, target.getX(), target.getY());
@@ -254,7 +254,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
     }
 
     private void notifyPlaced(BuildEntity entity, boolean isBreaking){
-        float dist = Math.min(entity.distanceTo(x, y) - placeDistance, 0);
+        float dist = Math.min(entity.dst(x, y) - placeDistance, 0);
 
         if(!state.is(build) && dist / type.maxVelocity < entity.buildCost * 0.9f){
             target = entity;
@@ -311,7 +311,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
 
     @Override
     protected void updateRotation(){
-        if(target != null && ((state.is(repair) && target.distanceTo(this) < type.range) || state.is(mine))){
+        if(target != null && ((state.is(repair) && target.dst(this) < type.range) || state.is(mine))){
             rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.3f);
         }else{
             rotation = Mathf.slerpDelta(rotation, velocity.angle(), 0.3f);
diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java
index 037f996902..cb21990ba0 100644
--- a/core/src/io/anuke/mindustry/game/EventType.java
+++ b/core/src/io/anuke/mindustry/game/EventType.java
@@ -43,14 +43,6 @@ public class EventType{
 
     }
 
-    /**
-     * Called after the WorldLoadEvent is, and all logic has been loaded.
-     * It is safe to intialize graphics here.
-     */
-    public static class WorldLoadGraphicsEvent implements Event{
-
-    }
-
     /**Called from the logic thread. Do not access graphics here!*/
     public static class TileChangeEvent implements Event{
         public final Tile tile;
diff --git a/core/src/io/anuke/mindustry/game/Saves.java b/core/src/io/anuke/mindustry/game/Saves.java
index e78dc44334..cdea8fcccd 100644
--- a/core/src/io/anuke/mindustry/game/Saves.java
+++ b/core/src/io/anuke/mindustry/game/Saves.java
@@ -1,18 +1,17 @@
 package io.anuke.mindustry.game;
 
 import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntArray;
-import io.anuke.arc.utils.IntMap;
-import io.anuke.arc.utils.TimeUtils;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.IntArray;
+import io.anuke.arc.util.IntMap;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.game.EventType.StateChangeEvent;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.mindustry.io.SaveMeta;
 import io.anuke.mindustry.maps.Map;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Settings;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Events;
+import io.anuke.arc.Timers;
 import io.anuke.arc.util.Strings;
 import io.anuke.arc.util.ThreadArray;
 
@@ -71,9 +70,9 @@ public class Saves{
         if(current != null && !state.is(State.menu)
             && !(state.isPaused() && ui.hasDialog())){
             if(lastTimestamp != 0){
-                totalPlaytime += TimeUtils.timeSinceMillis(lastTimestamp);
+                totalPlaytime += Time.timeSinceMillis(lastTimestamp);
             }
-            lastTimestamp = TimeUtils.millis();
+            lastTimestamp = Time.millis();
         }
 
         if(!state.is(State.menu) && !state.gameOver && current != null && current.isAutosave()){
diff --git a/core/src/io/anuke/mindustry/game/Teams.java b/core/src/io/anuke/mindustry/game/Teams.java
index 194f5af30c..5ee10b289f 100644
--- a/core/src/io/anuke/mindustry/game/Teams.java
+++ b/core/src/io/anuke/mindustry/game/Teams.java
@@ -1,10 +1,9 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.collection.EnumSet;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.util.EnumSet;
-import io.anuke.arc.util.ThreadSet;
 
 /**
  * Class for various team-based utilities.
@@ -52,7 +51,7 @@ public class Teams{
     }
 
     public class TeamData{
-        public final ObjectSet<Tile> cores = new ThreadSet<>();
+        public final ObjectSet<Tile> cores = new ObjectSet<>();
         public final EnumSet<Team> enemies;
         public final Team team;
 
diff --git a/core/src/io/anuke/mindustry/game/Unlocks.java b/core/src/io/anuke/mindustry/game/Unlocks.java
index aa5811b006..0a0fedd795 100644
--- a/core/src/io/anuke/mindustry/game/Unlocks.java
+++ b/core/src/io/anuke/mindustry/game/Unlocks.java
@@ -1,11 +1,11 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.arc.utils.ObjectMap;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.collection.ObjectMap;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.game.EventType.UnlockEvent;
 import io.anuke.mindustry.type.ContentType;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Settings;
+import io.anuke.arc.Events;
+import io.anuke.arc.Settings;
 
 /**Stores player unlocks. Clientside only.*/
 public class Unlocks{
diff --git a/core/src/io/anuke/mindustry/game/Version.java b/core/src/io/anuke/mindustry/game/Version.java
index baa484f4f1..eed6b3ead2 100644
--- a/core/src/io/anuke/mindustry/game/Version.java
+++ b/core/src/io/anuke/mindustry/game/Version.java
@@ -2,8 +2,8 @@ package io.anuke.mindustry.game;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.utils.ObjectMap;
-import io.anuke.arc.utils.PropertiesUtils;
+import io.anuke.arc.collection.ObjectMap;
+import io.anuke.arc.util.PropertiesUtils;
 import io.anuke.arc.util.Strings;
 
 import java.io.IOException;
diff --git a/core/src/io/anuke/mindustry/game/Waves.java b/core/src/io/anuke/mindustry/game/Waves.java
index 2241916c3a..d05a2f9aa3 100644
--- a/core/src/io/anuke/mindustry/game/Waves.java
+++ b/core/src/io/anuke/mindustry/game/Waves.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.content.UnitTypes;
diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
index ea4caa66fe..e7c32bdd98 100644
--- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
@@ -1,20 +1,20 @@
 package io.anuke.mindustry.graphics;
 
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntSet;
-import io.anuke.arc.utils.Sort;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.IntSet;
+import io.anuke.arc.util.Sort;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Core;
+import io.anuke.arc.Events;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Surface;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 import static io.anuke.arc.core.Core.camera;
diff --git a/core/src/io/anuke/mindustry/graphics/CacheLayer.java b/core/src/io/anuke/mindustry/graphics/CacheLayer.java
index 8d4c1fed33..9ff5b34d14 100644
--- a/core/src/io/anuke/mindustry/graphics/CacheLayer.java
+++ b/core/src/io/anuke/mindustry/graphics/CacheLayer.java
@@ -1,8 +1,8 @@
 package io.anuke.mindustry.graphics;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Core;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Shader;
 
diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java
index e0009c47e1..2a08753546 100644
--- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java
@@ -4,23 +4,22 @@ import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.GL20;
 import io.anuke.arc.graphics.OrthographicCamera;
-import io.anuke.arc.utils.IntArray;
-import io.anuke.arc.utils.IntSet;
-import io.anuke.arc.utils.IntSet.IntSetIterator;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.util.IntArray;
+import io.anuke.arc.util.IntSet;
+import io.anuke.arc.util.IntSet.IntSetIterator;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;
 import io.anuke.mindustry.maps.Sector;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.Floor;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Events;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.CacheBatch;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.util.Log;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Structs;
 
 import java.util.Arrays;
diff --git a/core/src/io/anuke/mindustry/graphics/FogRenderer.java b/core/src/io/anuke/mindustry/graphics/FogRenderer.java
index 92e36d9261..e2c1534440 100644
--- a/core/src/io/anuke/mindustry/graphics/FogRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/FogRenderer.java
@@ -7,15 +7,14 @@ import io.anuke.arc.graphics.Pixmap.Format;
 import io.anuke.arc.graphics.Texture;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.graphics.glutils.FrameBuffer;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.Disposable;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.Disposable;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Events;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.entities.EntityDraw;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
index 3bc143ee93..7fe6320c76 100644
--- a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
@@ -6,20 +6,19 @@ import io.anuke.arc.graphics.Pixmap.Format;
 import io.anuke.arc.graphics.Texture;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Rectangle;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.Disposable;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.Disposable;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;
 import io.anuke.mindustry.world.ColorMapper;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Events;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Pixmaps;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.ThreadArray;
 
 import static io.anuke.mindustry.Vars.tilesize;
diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
index 68d312a282..0b5f2f88a3 100644
--- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
@@ -4,7 +4,7 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.MathUtils;
 import io.anuke.arc.math.Rectangle;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.entities.TileEntity;
@@ -13,14 +13,14 @@ import io.anuke.mindustry.input.InputHandler;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockBar;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Settings;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Core;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Settings;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Tmp;
 
 import static io.anuke.mindustry.Vars.*;
diff --git a/core/src/io/anuke/mindustry/graphics/Shaders.java b/core/src/io/anuke/mindustry/graphics/Shaders.java
index efb19cb27c..dda1c86dc8 100644
--- a/core/src/io/anuke/mindustry/graphics/Shaders.java
+++ b/core/src/io/anuke/mindustry/graphics/Shaders.java
@@ -3,8 +3,8 @@ package io.anuke.mindustry.graphics;
 import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Core;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Shader;
 import io.anuke.arc.scene.ui.layout.Unit;
diff --git a/core/src/io/anuke/mindustry/graphics/Trail.java b/core/src/io/anuke/mindustry/graphics/Trail.java
index 0258e5ee53..f44fcbec9a 100644
--- a/core/src/io/anuke/mindustry/graphics/Trail.java
+++ b/core/src/io/anuke/mindustry/graphics/Trail.java
@@ -2,12 +2,12 @@ package io.anuke.mindustry.graphics;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.FloatArray;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.util.FloatArray;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 /**
  * Class that renders a colored trail.
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index 77a378f509..3bb6585cbd 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -11,15 +11,15 @@ import io.anuke.mindustry.input.PlaceUtils.NormalizeResult;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Inputs;
-import io.anuke.arc.core.Inputs.DeviceType;
-import io.anuke.arc.core.KeyBinds;
-import io.anuke.arc.core.Settings;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Inputs;
+import io.anuke.arc.Core.input.DeviceType;
+import io.anuke.arc.KeyBinds;
+import io.anuke.arc.Settings;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.scene.ui.layout.Unit;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 import static io.anuke.mindustry.input.CursorType.*;
@@ -128,11 +128,11 @@ public class DesktopInput extends InputHandler{
 
     @Override
     public void update(){
-        if(Net.active() && Inputs.keyTap("player_list")){
+        if(Net.active() && Core.input.keyTap("player_list")){
             ui.listfrag.toggle();
         }
 
-        if(Inputs.keyRelease(section, "select")){
+        if(Core.input.keyRelease(section, "select")){
             player.isShooting = false;
         }
 
@@ -141,11 +141,11 @@ public class DesktopInput extends InputHandler{
         boolean controller = KeyBinds.getSection(section).device.type == DeviceType.controller;
 
         //zoom and rotate things
-        if(Inputs.getAxisActive("zoom") && (Inputs.keyDown(section, "zoom_hold") || controller)){
-            renderer.scaleCamera((int) Inputs.getAxisTapped(section, "zoom"));
+        if(Core.input.getAxisActive("zoom") && (Core.input.keyDown(section, "zoom_hold") || controller)){
+            renderer.scaleCamera((int) Core.input.getAxisTapped(section, "zoom"));
         }
 
-        renderer.minimap.zoomBy(-(int) Inputs.getAxisTapped(section, "zoom_minimap"));
+        renderer.minimap.zoomBy(-(int) Core.input.getAxisTapped(section, "zoom_minimap"));
 
         if(player.isDead()) return;
 
@@ -167,7 +167,7 @@ public class DesktopInput extends InputHandler{
             selectScale = 0f;
         }
 
-        rotation = Mathf.mod(rotation + (int) Inputs.getAxisTapped(section, "rotate"), 4);
+        rotation = Mathf.mod(rotation + (int) Core.input.getAxisTapped(section, "rotate"), 4);
 
         Tile cursor = tileAt(Core.input.getX(), Core.input.getY());
 
@@ -203,11 +203,11 @@ public class DesktopInput extends InputHandler{
         int cursorX = tileX(Core.input.getX());
         int cursorY = tileY(Core.input.getY());
 
-        if(Inputs.keyTap(section, "deselect")){
+        if(Core.input.keyTap(section, "deselect")){
             player.setMineTile(null);
         }
 
-        if(Inputs.keyTap(section, "select") && !ui.hasMouse()){
+        if(Core.input.keyTap(section, "select") && !ui.hasMouse()){
             if(isPlacing()){
                 selectX = cursorX;
                 selectY = cursorY;
@@ -221,7 +221,7 @@ public class DesktopInput extends InputHandler{
             }else if(!ui.chatfrag.chatOpen()){ //if it's out of bounds, shooting is just fine
                 player.isShooting = true;
             }
-        }else if(Inputs.keyTap(section, "deselect") && (recipe != null || mode != none || player.isBuilding()) &&
+        }else if(Core.input.keyTap(section, "deselect") && (recipe != null || mode != none || player.isBuilding()) &&
         !(player.getCurrentRequest() != null && player.getCurrentRequest().breaking && KeyBinds.get(section, "deselect") == KeyBinds.get(section, "break"))){
             if(recipe == null){
                 player.clearBuilding();
@@ -229,7 +229,7 @@ public class DesktopInput extends InputHandler{
 
             recipe = null;
             mode = none;
-        }else if(Inputs.keyTap(section, "break") && !ui.hasMouse()){
+        }else if(Core.input.keyTap(section, "break") && !ui.hasMouse()){
             //is recalculated because setting the mode to breaking removes potential multiblock cursor offset
             mode = breaking;
             selectX = tileX(Core.input.getX());
@@ -237,7 +237,7 @@ public class DesktopInput extends InputHandler{
         }
 
 
-        if(Inputs.keyRelease(section, "break") || Inputs.keyRelease(section, "select")){
+        if(Core.input.keyRelease(section, "break") || Core.input.keyRelease(section, "select")){
 
             if(mode == placing){ //touch up while placing, place everything in selection
                 NormalizeResult result = PlaceUtils.normalizeArea(selectX, selectY, cursorX, cursorY, rotation, true, maxLength);
@@ -306,8 +306,8 @@ public class DesktopInput extends InputHandler{
                 controlling = true;
             }
 
-            float xa = Inputs.getAxis(section, "cursor_x");
-            float ya = Inputs.getAxis(section, "cursor_y");
+            float xa = Core.input.getAxis(section, "cursor_x");
+            float ya = Core.input.getAxis(section, "cursor_y");
 
             if(Math.abs(xa) > controllerMin || Math.abs(ya) > controllerMin){
                 float scl = Core.settings.getInt("sensitivity", 100) / 100f * Unit.dp.scl(1f);
@@ -319,7 +319,7 @@ public class DesktopInput extends InputHandler{
                     Core.input.setCursorCatched(true);
                 }
 
-                Inputs.getProcessor().touchDragged((int) getMouseX(), (int) getMouseY(), player.playerIndex);
+                Core.input.getProcessor().touchDragged((int) getMouseX(), (int) getMouseY(), player.playerIndex);
             }
 
             controlx = Mathf.clamp(controlx, 0, Core.graphics.getWidth());
diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java
index e318911da7..861de66305 100644
--- a/core/src/io/anuke/mindustry/input/InputHandler.java
+++ b/core/src/io/anuke/mindustry/input/InputHandler.java
@@ -6,11 +6,11 @@ import io.anuke.arc.Core;
 import io.anuke.arc.Graphics;
 import io.anuke.arc.entities.Effects;
 import io.anuke.arc.graphics.Color;
+import io.anuke.arc.input.InputProcessor;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.scene.event.InputListener;
 import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.utils.Time;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.fx.EnvironmentFx;
 import io.anuke.mindustry.entities.Player;
@@ -29,7 +29,7 @@ import io.anuke.mindustry.world.Tile;
 
 import static io.anuke.mindustry.Vars.*;
 
-public abstract class InputHandler implements InputListener{
+public abstract class InputHandler implements InputProcessor{
     /**Used for dropping items.*/
     final static float playerSelectRange = mobile ? 17f : 11f;
     /**Maximum line length.*/
@@ -69,47 +69,45 @@ public abstract class InputHandler implements InputListener{
             throw new ValidateException(player, "Player cannot transfer an item.");
         }
 
-        threads.run(() -> {
-            if(player == null || tile.entity == null) return;
+        if(player == null || tile.entity == null) return;
 
-            player.isTransferring = true;
+        player.isTransferring = true;
 
-            Item item = player.inventory.getItem().item;
-            int amount = player.inventory.getItem().amount;
-            int accepted = tile.block().acceptStack(item, amount, tile, player);
-            player.inventory.getItem().amount -= accepted;
+        Item item = player.inventory.getItem().item;
+        int amount = player.inventory.getItem().amount;
+        int accepted = tile.block().acceptStack(item, amount, tile, player);
+        player.inventory.getItem().amount -= accepted;
 
-            int sent = Mathf.clamp(accepted / 4, 1, 8);
-            int removed = accepted / sent;
-            int[] remaining = {accepted, accepted};
-            Block block = tile.block();
+        int sent = Mathf.clamp(accepted / 4, 1, 8);
+        int removed = accepted / sent;
+        int[] remaining = {accepted, accepted};
+        Block block = tile.block();
 
-            for(int i = 0; i < sent; i++){
-                boolean end = i == sent - 1;
-                Time.run(i * 3, () -> {
-                    tile.block().getStackOffset(item, tile, stackTrns);
+        for(int i = 0; i < sent; i++){
+            boolean end = i == sent - 1;
+            Time.run(i * 3, () -> {
+                tile.block().getStackOffset(item, tile, stackTrns);
 
-                    ItemTransfer.create(item,
-                            player.x + Mathf.trnsx(player.rotation + 180f, backTrns), player.y + Mathf.trnsy(player.rotation + 180f, backTrns),
-                            new Vector2(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> {
-                                if(tile.block() != block || tile.entity == null || tile.entity.items == null) return;
+                ItemTransfer.create(item,
+                        player.x + Mathf.trnsx(player.rotation + 180f, backTrns), player.y + Mathf.trnsy(player.rotation + 180f, backTrns),
+                        new Vector2(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> {
+                            if(tile.block() != block || tile.entity == null || tile.entity.items == null) return;
 
-                                tile.block().handleStack(item, removed, tile, player);
-                                remaining[1] -= removed;
+                            tile.block().handleStack(item, removed, tile, player);
+                            remaining[1] -= removed;
 
-                                if(end && remaining[1] > 0){
-                                    tile.block().handleStack(item, remaining[1], tile, player);
-                                }
-                            });
+                            if(end && remaining[1] > 0){
+                                tile.block().handleStack(item, remaining[1], tile, player);
+                            }
+                        });
 
-                    remaining[0] -= removed;
+                remaining[0] -= removed;
 
-                    if(end){
-                        player.isTransferring = false;
-                    }
-                });
-            }
-        });
+                if(end){
+                    player.isTransferring = false;
+                }
+            });
+        }
     }
 
     @Remote(targets = Loc.both, called = Loc.server, forward = true)
@@ -246,7 +244,7 @@ public abstract class InputHandler implements InputListener{
                 && tile.floor().drops != null && tile.floor().drops.item.hardness <= player.mech.drillPower
                 && !tile.floor().playerUnmineable
                 && player.inventory.canAcceptItem(tile.floor().drops.item)
-                && tile.block() == Blocks.air && player.distanceTo(tile.worldx(), tile.worldy()) <= Player.mineDistance;
+                && tile.block() == Blocks.air && player.dst(tile.worldx(), tile.worldy()) <= Player.mineDistance;
     }
 
     /**Returns the tile at the specified MOUSE coordinates.*/
@@ -283,7 +281,7 @@ public abstract class InputHandler implements InputListener{
     }
 
     public void remove(){
-        Inputs.removeProcessor(this);
+        Core.input.removeProcessor(this);
         frag.remove();
     }
 
@@ -334,7 +332,7 @@ public abstract class InputHandler implements InputListener{
 
     public boolean validPlace(int x, int y, Block type, int rotation){
         for(Tile tile : state.teams.get(player.getTeam()).cores){
-            if(tile.distanceTo(x * tilesize, y * tilesize) < coreBuildRange){
+            if(tile.dst(x * tilesize, y * tilesize) < coreBuildRange){
                 return Build.validPlace(player.getTeam(), x, y, type, rotation) &&
                 Vector2.dst(player.x, player.y, x * tilesize, y * tilesize) < Player.placeDistance;
             }
diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java
index 9ef5172771..9fceb82590 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/io/anuke/mindustry/input/MobileInput.java
@@ -8,9 +8,9 @@ import io.anuke.arc.input.GestureDetector.GestureListener;
 import io.anuke.arc.math.Interpolation;
 import io.anuke.arc.math.Rectangle;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Align;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.util.Align;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.core.GameState.State;
@@ -27,11 +27,11 @@ import io.anuke.mindustry.type.Recipe;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.*;
+import io.anuke.arc.*;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 import static io.anuke.mindustry.input.PlaceMode.*;
@@ -76,7 +76,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
     public MobileInput(Player player){
         super(player);
-        Inputs.addProcessor(new GestureDetector(20, 0.5f, 0.4f, 0.15f, this));
+        Core.input.addProcessor(new GestureDetector(20, 0.5f, 0.4f, 0.15f, this));
     }
 
     //region utility methods
diff --git a/core/src/io/anuke/mindustry/input/PlaceUtils.java b/core/src/io/anuke/mindustry/input/PlaceUtils.java
index 8e95995554..c2e3370eed 100644
--- a/core/src/io/anuke/mindustry/input/PlaceUtils.java
+++ b/core/src/io/anuke/mindustry/input/PlaceUtils.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.input;
 
 import io.anuke.mindustry.world.Block;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.tilesize;
 
diff --git a/core/src/io/anuke/mindustry/io/BundleLoader.java b/core/src/io/anuke/mindustry/io/BundleLoader.java
index 765802ea05..ebc6e3bccf 100644
--- a/core/src/io/anuke/mindustry/io/BundleLoader.java
+++ b/core/src/io/anuke/mindustry/io/BundleLoader.java
@@ -2,11 +2,9 @@ package io.anuke.mindustry.io;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.utils.I18NBundle;
+import io.anuke.arc.util.I18NBundle;
 import io.anuke.mindustry.Vars;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Settings;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.util.Log;
 
 import java.util.Locale;
diff --git a/core/src/io/anuke/mindustry/io/Changelogs.java b/core/src/io/anuke/mindustry/io/Changelogs.java
index 44d707c7bc..e12bfda0c9 100644
--- a/core/src/io/anuke/mindustry/io/Changelogs.java
+++ b/core/src/io/anuke/mindustry/io/Changelogs.java
@@ -1,8 +1,8 @@
 package io.anuke.mindustry.io;
 
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.JsonReader;
-import io.anuke.arc.utils.JsonValue;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.JsonReader;
+import io.anuke.arc.util.JsonValue;
 import io.anuke.mindustry.net.Net;
 import io.anuke.arc.function.Consumer;
 
diff --git a/core/src/io/anuke/mindustry/io/Contributors.java b/core/src/io/anuke/mindustry/io/Contributors.java
index 6fe95d3fc5..c57a951008 100644
--- a/core/src/io/anuke/mindustry/io/Contributors.java
+++ b/core/src/io/anuke/mindustry/io/Contributors.java
@@ -1,8 +1,8 @@
 package io.anuke.mindustry.io;
 
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.JsonReader;
-import io.anuke.arc.utils.JsonValue;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.JsonReader;
+import io.anuke.arc.util.JsonValue;
 import io.anuke.mindustry.net.Net;
 import io.anuke.arc.function.Consumer;
 
diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java
index 2ee32dbf19..3e78fd718f 100644
--- a/core/src/io/anuke/mindustry/io/MapIO.java
+++ b/core/src/io/anuke/mindustry/io/MapIO.java
@@ -3,9 +3,9 @@ package io.anuke.mindustry.io;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.Pixmap;
 import io.anuke.arc.graphics.Pixmap.Format;
-import io.anuke.arc.utils.IntIntMap;
-import io.anuke.arc.utils.ObjectMap;
-import io.anuke.arc.utils.ObjectMap.Entry;
+import io.anuke.arc.util.IntIntMap;
+import io.anuke.arc.collection.ObjectMap;
+import io.anuke.arc.util.ObjectMap.Entry;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.blocks.StorageBlocks;
 import io.anuke.mindustry.game.Team;
diff --git a/core/src/io/anuke/mindustry/io/SaveFileVersion.java b/core/src/io/anuke/mindustry/io/SaveFileVersion.java
index 74273b1662..0d9358a303 100644
--- a/core/src/io/anuke/mindustry/io/SaveFileVersion.java
+++ b/core/src/io/anuke/mindustry/io/SaveFileVersion.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.io;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.blocks.StorageBlocks;
 import io.anuke.mindustry.entities.traits.SaveTrait;
diff --git a/core/src/io/anuke/mindustry/io/SaveIO.java b/core/src/io/anuke/mindustry/io/SaveIO.java
index 960d4cf20b..ad7e86f35a 100644
--- a/core/src/io/anuke/mindustry/io/SaveIO.java
+++ b/core/src/io/anuke/mindustry/io/SaveIO.java
@@ -1,9 +1,9 @@
 package io.anuke.mindustry.io;
 
 import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntArray;
-import io.anuke.arc.utils.IntMap;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.IntArray;
+import io.anuke.arc.util.IntMap;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.io.versions.Save16;
 
diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/io/anuke/mindustry/io/TypeIO.java
index 2587c3c334..dbf53b8065 100644
--- a/core/src/io/anuke/mindustry/io/TypeIO.java
+++ b/core/src/io/anuke/mindustry/io/TypeIO.java
@@ -20,8 +20,8 @@ import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Pos;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.entities.Entities;
 
 import java.io.DataInput;
diff --git a/core/src/io/anuke/mindustry/io/versions/Save16.java b/core/src/io/anuke/mindustry/io/versions/Save16.java
index f705cd1b4b..551e3e798b 100644
--- a/core/src/io/anuke/mindustry/io/versions/Save16.java
+++ b/core/src/io/anuke/mindustry/io/versions/Save16.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.io.versions;
 
-import io.anuke.arc.utils.TimeUtils;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.game.Difficulty;
 import io.anuke.mindustry.game.GameMode;
 import io.anuke.mindustry.game.Version;
@@ -56,7 +56,7 @@ public class Save16 extends SaveFileVersion{
     public void write(DataOutputStream stream) throws IOException{
         //--META--
         stream.writeInt(version); //version id
-        stream.writeLong(TimeUtils.millis()); //last saved
+        stream.writeLong(Time.millis()); //last saved
         stream.writeLong(headless ? 0 : control.saves.getTotalPlaytime()); //playtime
         stream.writeInt(Version.build); //build
         stream.writeInt(world.getSector() == null ? invalidSector : world.getSector().pos()); //sector ID
diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/io/anuke/mindustry/maps/Map.java
index ae40f59fad..2481d42344 100644
--- a/core/src/io/anuke/mindustry/maps/Map.java
+++ b/core/src/io/anuke/mindustry/maps/Map.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.maps;
 
 import io.anuke.arc.graphics.Texture;
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.arc.function.Supplier;
 
 import java.io.InputStream;
diff --git a/core/src/io/anuke/mindustry/maps/MapMeta.java b/core/src/io/anuke/mindustry/maps/MapMeta.java
index 2bdfa05c16..6a2bfec913 100644
--- a/core/src/io/anuke/mindustry/maps/MapMeta.java
+++ b/core/src/io/anuke/mindustry/maps/MapMeta.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.maps;
 
-import io.anuke.arc.utils.IntIntMap;
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.util.IntIntMap;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.arc.util.Bundles;
 
 public class MapMeta{
diff --git a/core/src/io/anuke/mindustry/maps/MapTileData.java b/core/src/io/anuke/mindustry/maps/MapTileData.java
index 44789f31eb..dbbbfdb103 100644
--- a/core/src/io/anuke/mindustry/maps/MapTileData.java
+++ b/core/src/io/anuke/mindustry/maps/MapTileData.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.maps;
 
-import io.anuke.arc.utils.IntIntMap;
+import io.anuke.arc.util.IntIntMap;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.world.Block;
diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java
index 6d63f6cc4c..7fdf631116 100644
--- a/core/src/io/anuke/mindustry/maps/Maps.java
+++ b/core/src/io/anuke/mindustry/maps/Maps.java
@@ -3,9 +3,9 @@ package io.anuke.mindustry.maps;
 import io.anuke.arc.Core;
 import io.anuke.arc.files.FileHandle;
 import io.anuke.arc.graphics.Texture;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.Disposable;
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.Disposable;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.mindustry.io.MapIO;
 import io.anuke.arc.function.Supplier;
 import io.anuke.arc.util.Log;
diff --git a/core/src/io/anuke/mindustry/maps/Sector.java b/core/src/io/anuke/mindustry/maps/Sector.java
index 59e19fac78..cb857333db 100644
--- a/core/src/io/anuke/mindustry/maps/Sector.java
+++ b/core/src/io/anuke/mindustry/maps/Sector.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.maps;
 
 import io.anuke.arc.graphics.Texture;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.annotations.Annotations.Serialize;
 import io.anuke.mindustry.game.Saves.SaveSlot;
 import io.anuke.mindustry.game.SpawnGroup;
diff --git a/core/src/io/anuke/mindustry/maps/SectorPresets.java b/core/src/io/anuke/mindustry/maps/SectorPresets.java
index 9e1cd27924..3983aad73e 100644
--- a/core/src/io/anuke/mindustry/maps/SectorPresets.java
+++ b/core/src/io/anuke/mindustry/maps/SectorPresets.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.maps;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.content.Mechs;
diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java
index c8b6d755c5..fa01340137 100644
--- a/core/src/io/anuke/mindustry/maps/Sectors.java
+++ b/core/src/io/anuke/mindustry/maps/Sectors.java
@@ -5,9 +5,9 @@ import io.anuke.arc.graphics.Pixmap;
 import io.anuke.arc.graphics.Pixmap.Format;
 import io.anuke.arc.graphics.Texture;
 import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.Array.ArrayIterable;
-import io.anuke.arc.utils.async.AsyncExecutor;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.Array.ArrayIterable;
+import io.anuke.arc.util.async.AsyncExecutor;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.game.Difficulty;
@@ -27,7 +27,6 @@ import io.anuke.mindustry.type.Recipe.RecipeVisibility;
 import io.anuke.mindustry.world.ColorMapper;
 import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.mindustry.world.blocks.defense.Wall;
-import io.anuke.arc.core.Settings;
 import io.anuke.arc.util.*;
 
 import static io.anuke.mindustry.Vars.*;
diff --git a/core/src/io/anuke/mindustry/maps/TutorialSector.java b/core/src/io/anuke/mindustry/maps/TutorialSector.java
index fb88e20bfc..436f0678c2 100644
--- a/core/src/io/anuke/mindustry/maps/TutorialSector.java
+++ b/core/src/io/anuke/mindustry/maps/TutorialSector.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.maps;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.blocks.CraftingBlocks;
 import io.anuke.mindustry.content.blocks.ProductionBlocks;
diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
index 1606430bf6..3ded2deec6 100644
--- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
@@ -2,9 +2,9 @@ package io.anuke.mindustry.maps.generation;
 
 import io.anuke.arc.math.GridPoint2;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntIntMap;
-import io.anuke.arc.utils.Predicate;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.IntIntMap;
+import io.anuke.arc.util.Predicate;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.content.blocks.*;
@@ -33,7 +33,7 @@ import io.anuke.arc.function.BiFunction;
 import io.anuke.arc.function.IntPositionConsumer;
 import io.anuke.arc.function.TriFunction;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.content;
 
diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
index e76aad927d..9dfc69ee9e 100644
--- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
@@ -2,9 +2,9 @@ package io.anuke.mindustry.maps.generation;
 
 import io.anuke.arc.math.GridPoint2;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntArray;
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.IntArray;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.blocks.OreBlocks;
@@ -24,7 +24,7 @@ import io.anuke.mindustry.world.blocks.OreBlock;
 import io.anuke.arc.noise.RidgedPerlin;
 import io.anuke.arc.noise.Simplex;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.SeedRandom;
 import io.anuke.arc.util.Structs;
 
diff --git a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java
index 2e53faa50b..db19db6248 100644
--- a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java
+++ b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.maps.missions;
 
 import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.game.GameMode;
 import io.anuke.mindustry.game.Team;
diff --git a/core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java b/core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java
index 7b7e35eebb..0da3c5c9d8 100644
--- a/core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java
+++ b/core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java
@@ -2,12 +2,12 @@ package io.anuke.mindustry.maps.missions;
 
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.world.Block;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Angles;
 import io.anuke.arc.util.Bundles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.players;
 import static io.anuke.mindustry.Vars.tilesize;
diff --git a/core/src/io/anuke/mindustry/maps/missions/LineBlockMission.java b/core/src/io/anuke/mindustry/maps/missions/LineBlockMission.java
index 26a1b5c01c..0c9d3c8baa 100644
--- a/core/src/io/anuke/mindustry/maps/missions/LineBlockMission.java
+++ b/core/src/io/anuke/mindustry/maps/missions/LineBlockMission.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.maps.missions;
 
 import io.anuke.arc.math.Bresenham2;
 import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.world.Block;
 
 public class LineBlockMission extends Mission{
diff --git a/core/src/io/anuke/mindustry/maps/missions/Mission.java b/core/src/io/anuke/mindustry/maps/missions/Mission.java
index 9bebea354a..54c8cbcd27 100644
--- a/core/src/io/anuke/mindustry/maps/missions/Mission.java
+++ b/core/src/io/anuke/mindustry/maps/missions/Mission.java
@@ -1,13 +1,13 @@
 package io.anuke.mindustry.maps.missions;
 
 import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.game.GameMode;
 import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.maps.Sector;
 import io.anuke.mindustry.maps.generation.Generation;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.util.Bundles;
 
diff --git a/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java b/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
index 405946f2cd..cacdf19d40 100644
--- a/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
+++ b/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.maps.missions;
 
 import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.blocks.StorageBlocks;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.maps.generation.Generation;
diff --git a/core/src/io/anuke/mindustry/maps/missions/Missions.java b/core/src/io/anuke/mindustry/maps/missions/Missions.java
index 8ba6e71e8e..871422a528 100644
--- a/core/src/io/anuke/mindustry/maps/missions/Missions.java
+++ b/core/src/io/anuke/mindustry/maps/missions/Missions.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.maps.missions;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.type.Recipe;
 import io.anuke.mindustry.world.Block;
diff --git a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java
index 74c9fae8d8..f5c0e78090 100644
--- a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java
+++ b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.maps.missions;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.game.GameMode;
 import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.game.Team;
diff --git a/core/src/io/anuke/mindustry/net/Administration.java b/core/src/io/anuke/mindustry/net/Administration.java
index 1c573dd62b..97f4b0b980 100644
--- a/core/src/io/anuke/mindustry/net/Administration.java
+++ b/core/src/io/anuke/mindustry/net/Administration.java
@@ -1,10 +1,10 @@
 package io.anuke.mindustry.net;
 
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.ObjectMap;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.ObjectMap;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.annotations.Annotations.Serialize;
-import io.anuke.arc.core.Settings;
+import io.anuke.arc.Settings;
 
 import static io.anuke.mindustry.Vars.headless;
 
diff --git a/core/src/io/anuke/mindustry/net/Interpolator.java b/core/src/io/anuke/mindustry/net/Interpolator.java
index 63a8589040..45b39f9d56 100644
--- a/core/src/io/anuke/mindustry/net/Interpolator.java
+++ b/core/src/io/anuke/mindustry/net/Interpolator.java
@@ -1,9 +1,8 @@
 package io.anuke.mindustry.net;
 
-
-import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.TimeUtils;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.Vector2;
+import io.anuke.arc.util.Time;
 
 public class Interpolator{
     //used for movement
@@ -17,9 +16,9 @@ public class Interpolator{
     public float[] values = {};
 
     public void read(float cx, float cy, float x, float y, long sent, float... target1ds){
-        if(lastUpdated != 0) updateSpacing = TimeUtils.timeSinceMillis(lastUpdated);
+        if(lastUpdated != 0) updateSpacing = Time.timeSinceMillis(lastUpdated);
 
-        lastUpdated = TimeUtils.millis();
+        lastUpdated = Time.millis();
 
         targets = target1ds;
         last.set(cx, cy);
@@ -46,10 +45,10 @@ public class Interpolator{
         }*/
 
         if(lastUpdated != 0 && updateSpacing != 0){
-            float timeSinceUpdate = TimeUtils.timeSinceMillis(lastUpdated);
+            float timeSinceUpdate = Time.timeSinceMillis(lastUpdated);
             float alpha = Math.min(timeSinceUpdate / updateSpacing, 2f);
 
-            Mathf.lerp2(pos.set(last), target, alpha);
+            pos.set(last).lerpPast(target, alpha);
 
             if(values.length != targets.length){
                 values = new float[targets.length];
diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java
index 9c7e2e6c27..bbb02c2e8a 100644
--- a/core/src/io/anuke/mindustry/net/Net.java
+++ b/core/src/io/anuke/mindustry/net/Net.java
@@ -5,16 +5,16 @@ import io.anuke.arc.Net.HttpRequest;
 import io.anuke.arc.Net.HttpResponse;
 import io.anuke.arc.Net.HttpResponseListener;
 import io.anuke.arc.net.HttpRequestBuilder;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntMap;
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.IntMap;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Packets.KickReason;
 import io.anuke.mindustry.net.Packets.StreamBegin;
 import io.anuke.mindustry.net.Packets.StreamChunk;
 import io.anuke.mindustry.net.Streamable.StreamBuilder;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.function.BiConsumer;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.util.Bundles;
diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java
index 13d1603246..e10226d2ac 100644
--- a/core/src/io/anuke/mindustry/net/NetworkIO.java
+++ b/core/src/io/anuke/mindustry/net/NetworkIO.java
@@ -1,8 +1,8 @@
 package io.anuke.mindustry.net;
 
-import io.anuke.arc.utils.ObjectMap;
-import io.anuke.arc.utils.ObjectMap.Entry;
-import io.anuke.arc.utils.TimeUtils;
+import io.anuke.arc.collection.ObjectMap;
+import io.anuke.arc.util.ObjectMap.Entry;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.game.GameMode;
@@ -14,8 +14,8 @@ import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.maps.MapMeta;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BlockPart;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Core;
+import io.anuke.arc.Timers;
 import io.anuke.arc.entities.Entities;
 import io.anuke.arc.util.Bits;
 
@@ -186,7 +186,7 @@ public class NetworkIO{
             Entities.clear();
             int id = stream.readInt();
             player.resetNoAdd();
-            player.read(stream, TimeUtils.millis());
+            player.read(stream, Time.millis());
             player.resetID(id);
             player.add();
 
diff --git a/core/src/io/anuke/mindustry/net/Packet.java b/core/src/io/anuke/mindustry/net/Packet.java
index ee80bbbebe..ea58b85f26 100644
--- a/core/src/io/anuke/mindustry/net/Packet.java
+++ b/core/src/io/anuke/mindustry/net/Packet.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.net;
 
-import io.anuke.arc.utils.Pool.Poolable;
+import io.anuke.arc.util.Pool.Poolable;
 
 import java.nio.ByteBuffer;
 
diff --git a/core/src/io/anuke/mindustry/net/Packets.java b/core/src/io/anuke/mindustry/net/Packets.java
index d93860032e..c830f9a76b 100644
--- a/core/src/io/anuke/mindustry/net/Packets.java
+++ b/core/src/io/anuke/mindustry/net/Packets.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.net;
 
-import io.anuke.arc.utils.Base64Coder;
+import io.anuke.arc.util.Base64Coder;
 import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.io.TypeIO;
 import io.anuke.arc.util.Bundles;
diff --git a/core/src/io/anuke/mindustry/net/Registrator.java b/core/src/io/anuke/mindustry/net/Registrator.java
index 97920d478d..2c76e3dd30 100644
--- a/core/src/io/anuke/mindustry/net/Registrator.java
+++ b/core/src/io/anuke/mindustry/net/Registrator.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.net;
 
-import io.anuke.arc.utils.ObjectIntMap;
+import io.anuke.arc.util.ObjectIntMap;
 import io.anuke.mindustry.net.Packets.*;
 import io.anuke.arc.function.Supplier;
 
diff --git a/core/src/io/anuke/mindustry/type/AmmoType.java b/core/src/io/anuke/mindustry/type/AmmoType.java
index 00fab82ace..24150b4b14 100644
--- a/core/src/io/anuke/mindustry/type/AmmoType.java
+++ b/core/src/io/anuke/mindustry/type/AmmoType.java
@@ -3,7 +3,7 @@ package io.anuke.mindustry.type;
 import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.entities.bullet.BulletType;
 import io.anuke.mindustry.game.Content;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.entities.Effects.Effect;
 
 public class AmmoType extends Content {
     /**The item used. Always null if liquid isn't.*/
diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/io/anuke/mindustry/type/Item.java
index 6c1c844f98..3e90f28c46 100644
--- a/core/src/io/anuke/mindustry/type/Item.java
+++ b/core/src/io/anuke/mindustry/type/Item.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.type;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.graphics.Palette;
@@ -55,7 +55,7 @@ public class Item extends UnlockableContent implements Comparable<Item>{
     }
 
     public void load(){
-        this.region = Draw.region("item-" + name);
+        this.region = Core.atlas.find("item-" + name);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/type/Liquid.java b/core/src/io/anuke/mindustry/type/Liquid.java
index d143b7cbba..d937f9f40a 100644
--- a/core/src/io/anuke/mindustry/type/Liquid.java
+++ b/core/src/io/anuke/mindustry/type/Liquid.java
@@ -45,7 +45,7 @@ public class Liquid extends UnlockableContent{
 
     @Override
     public void load(){
-        iconRegion = Draw.region("liquid-icon-" + name);
+        iconRegion = Core.atlas.find("liquid-icon-" + name);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java
index cad0baf650..10b777d437 100644
--- a/core/src/io/anuke/mindustry/type/Mech.java
+++ b/core/src/io/anuke/mindustry/type/Mech.java
@@ -94,12 +94,12 @@ public class Mech extends UnlockableContent{
     @Override
     public void load(){
         if(!flying){
-            legRegion = Draw.region(name + "-leg");
-            baseRegion = Draw.region(name + "-base");
+            legRegion = Core.atlas.find(name + "-leg");
+            baseRegion = Core.atlas.find(name + "-base");
         }
 
-        region = Draw.region(name);
-        iconRegion = Draw.region("mech-icon-" + name);
+        region = Core.atlas.find(name);
+        iconRegion = Core.atlas.find("mech-icon-" + name);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/type/Recipe.java b/core/src/io/anuke/mindustry/type/Recipe.java
index 1bcd79306a..9b6497752a 100644
--- a/core/src/io/anuke/mindustry/type/Recipe.java
+++ b/core/src/io/anuke/mindustry/type/Recipe.java
@@ -1,9 +1,9 @@
 package io.anuke.mindustry.type;
 
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.ObjectMap;
-import io.anuke.arc.utils.OrderedMap;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.ObjectMap;
+import io.anuke.arc.util.OrderedMap;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.game.GameMode;
 import io.anuke.mindustry.game.UnlockableContent;
diff --git a/core/src/io/anuke/mindustry/type/StatusEffect.java b/core/src/io/anuke/mindustry/type/StatusEffect.java
index 88fcaa7021..2180699a83 100644
--- a/core/src/io/anuke/mindustry/type/StatusEffect.java
+++ b/core/src/io/anuke/mindustry/type/StatusEffect.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.type;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.entities.StatusController.StatusEntry;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.game.Content;
diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java
index 4c1e3dfe27..a6b0dedaba 100644
--- a/core/src/io/anuke/mindustry/type/Weapon.java
+++ b/core/src/io/anuke/mindustry/type/Weapon.java
@@ -11,12 +11,12 @@ import io.anuke.mindustry.entities.traits.ShooterTrait;
 import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.util.Angles;
 import io.anuke.arc.util.Log;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Translator;
 
 public class Weapon extends Content{
@@ -101,8 +101,8 @@ public class Weapon extends Content{
 
     @Override
     public void load(){
-        equipRegion = Draw.region(name + "-equip");
-        region = Draw.region(name);
+        equipRegion = Core.atlas.find(name + "-equip");
+        region = Core.atlas.find(name);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/io/anuke/mindustry/ui/ContentDisplay.java
index a47311da63..8e1e2c367e 100644
--- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java
+++ b/core/src/io/anuke/mindustry/ui/ContentDisplay.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.ui;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.OrderedMap;
+import io.anuke.arc.util.OrderedMap;
 import io.anuke.mindustry.entities.units.UnitType;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.type.Item;
@@ -26,7 +26,7 @@ public class ContentDisplay{
         table.table(title -> {
             int size = 8 * 6;
 
-            title.addImage(Draw.region("block-icon-" + block.name)).size(size);
+            title.addImage(Core.atlas.find("block-icon-" + block.name)).size(size);
             title.add("[accent]" + block.formalName).padLeft(5);
         });
 
diff --git a/core/src/io/anuke/mindustry/ui/GridImage.java b/core/src/io/anuke/mindustry/ui/GridImage.java
index 0815041e06..c18aa1d878 100644
--- a/core/src/io/anuke/mindustry/ui/GridImage.java
+++ b/core/src/io/anuke/mindustry/ui/GridImage.java
@@ -14,7 +14,7 @@ public class GridImage extends Element{
     }
 
     public void draw(Batch batch, float alpha){
-        TextureRegion blank = Draw.region("white");
+        TextureRegion blank = Core.atlas.find("white");
 
         float xspace = (getWidth() / imageWidth);
         float yspace = (getHeight() / imageHeight);
diff --git a/core/src/io/anuke/mindustry/ui/MenuButton.java b/core/src/io/anuke/mindustry/ui/MenuButton.java
index 8eab27c59f..9d5f34430e 100644
--- a/core/src/io/anuke/mindustry/ui/MenuButton.java
+++ b/core/src/io/anuke/mindustry/ui/MenuButton.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.ui;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.Align;
+import io.anuke.arc.util.Align;
 import io.anuke.arc.scene.ui.TextButton;
 
 public class MenuButton extends TextButton{
diff --git a/core/src/io/anuke/mindustry/ui/Minimap.java b/core/src/io/anuke/mindustry/ui/Minimap.java
index 90811ef6ef..7041bb8166 100644
--- a/core/src/io/anuke/mindustry/ui/Minimap.java
+++ b/core/src/io/anuke/mindustry/ui/Minimap.java
@@ -3,8 +3,8 @@ package io.anuke.mindustry.ui;
 import io.anuke.arc.graphics.Texture.TextureFilter;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.graphics.Shaders;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Core;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.scene.Element;
 import io.anuke.arc.scene.event.InputEvent;
diff --git a/core/src/io/anuke/mindustry/ui/MobileButton.java b/core/src/io/anuke/mindustry/ui/MobileButton.java
index d6716fdca0..4d64eafe5c 100644
--- a/core/src/io/anuke/mindustry/ui/MobileButton.java
+++ b/core/src/io/anuke/mindustry/ui/MobileButton.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.ui;
 
-import io.anuke.arc.utils.Align;
+import io.anuke.arc.util.Align;
 import io.anuke.arc.scene.ui.ImageButton;
 
 public class MobileButton extends ImageButton{
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
index 57674967f9..b30a5d471f 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
@@ -2,15 +2,15 @@ package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.io.Contributors;
 import io.anuke.mindustry.io.Contributors.Contributor;
 import io.anuke.mindustry.ui.Links;
 import io.anuke.mindustry.ui.Links.LinkEntry;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Core;
+import io.anuke.arc.Timers;
 import io.anuke.arc.scene.ui.ScrollPane;
 import io.anuke.arc.scene.ui.layout.Cell;
 import io.anuke.arc.scene.ui.layout.Table;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java
index 2c95c7dfb8..431939a70d 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java
@@ -1,12 +1,12 @@
 package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.Core;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.io.Changelogs;
 import io.anuke.mindustry.io.Changelogs.VersionInfo;
 import io.anuke.mindustry.game.Version;
-import io.anuke.arc.core.Settings;
+import io.anuke.arc.Settings;
 import io.anuke.arc.scene.ui.ScrollPane;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.util.Log;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java
index 2e4639819c..2c6563014f 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.Input.Keys;
-import io.anuke.arc.utils.Align;
+import io.anuke.arc.util.Align;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.arc.scene.ui.Image;
 import io.anuke.arc.scene.ui.KeybindDialog;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
index b8ef727427..14bfa623f3 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
@@ -2,13 +2,12 @@ package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.Align;
-import io.anuke.arc.utils.Scaling;
+import io.anuke.arc.util.Align;
+import io.anuke.arc.util.Scaling;
 import io.anuke.mindustry.game.Difficulty;
 import io.anuke.mindustry.game.GameMode;
 import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.ui.BorderImage;
-import io.anuke.arc.core.Settings;
 import io.anuke.arc.scene.event.Touchable;
 import io.anuke.arc.scene.ui.ButtonGroup;
 import io.anuke.arc.scene.ui.ImageButton;
@@ -16,7 +15,7 @@ import io.anuke.arc.scene.ui.ScrollPane;
 import io.anuke.arc.scene.ui.TextButton;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.util.Bundles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
index d2b44d6d52..3025098378 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
@@ -3,12 +3,11 @@ package io.anuke.mindustry.ui.dialogs;
 import io.anuke.arc.Core;
 import io.anuke.arc.files.FileHandle;
 import io.anuke.arc.graphics.g2d.GlyphLayout;
-import io.anuke.arc.utils.Align;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.util.Align;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.Platform;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.function.Predicate;
 import io.anuke.arc.scene.event.Touchable;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
index 4b2e76a892..30eca7e8c9 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
@@ -2,13 +2,12 @@ package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.Input.Keys;
-import io.anuke.arc.utils.Align;
+import io.anuke.arc.util.Align;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.game.EventType.ResizeEvent;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.net.Net;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Events;
+import io.anuke.arc.Events;
 import io.anuke.arc.scene.ui.Dialog;
 import io.anuke.arc.scene.ui.ScrollPane;
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java
index 98d1f55df9..9af57b617f 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java
@@ -4,8 +4,8 @@ import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Pixmap;
 import io.anuke.arc.graphics.Pixmap.Format;
 import io.anuke.arc.graphics.Texture;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.async.AsyncExecutor;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.async.AsyncExecutor;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult;
@@ -17,7 +17,7 @@ import io.anuke.arc.scene.event.InputEvent;
 import io.anuke.arc.scene.event.InputListener;
 import io.anuke.arc.scene.utils.Cursors;
 import io.anuke.arc.util.GridMap;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.sectorSize;
 import static io.anuke.mindustry.Vars.world;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
index 79c6515947..aea61b38c6 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
@@ -4,8 +4,8 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.net.Net;
-import io.anuke.arc.core.Settings;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Settings;
+import io.anuke.arc.Timers;
 import io.anuke.arc.scene.ui.ImageButton;
 import io.anuke.arc.util.Bundles;
 import io.anuke.arc.util.Strings;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
index 553ad8346e..c5cbce9599 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.MathUtils;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.annotations.Annotations.Serialize;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.Platform;
@@ -10,8 +10,8 @@ import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.net.Host;
 import io.anuke.mindustry.net.Net;
-import io.anuke.arc.core.Settings;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Settings;
+import io.anuke.arc.Timers;
 import io.anuke.arc.scene.style.Drawable;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.Cell;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java
index dece4b9e89..a3ec2b1625 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.ui.dialogs;
 
-import io.anuke.arc.core.Settings;
+import io.anuke.arc.Settings;
 import io.anuke.arc.scene.ui.ButtonGroup;
 import io.anuke.arc.scene.ui.ScrollPane;
 import io.anuke.arc.scene.ui.TextButton;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
index 1ded88a8ff..d7a04f9e78 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
@@ -2,14 +2,14 @@ package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.Core;
 import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.mindustry.game.Saves.SaveSlot;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Core;
+import io.anuke.arc.Timers;
 import io.anuke.arc.scene.ui.ScrollPane;
 import io.anuke.arc.scene.ui.TextButton;
 import io.anuke.arc.scene.ui.layout.Table;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java
index d08424a6f3..95a2128c47 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.ui.dialogs;
 
-import io.anuke.arc.utils.Scaling;
+import io.anuke.arc.util.Scaling;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.scene.ui.Image;
@@ -39,7 +39,7 @@ public class LocalPlayerDialog extends FloatingDialog{
 
             stack.add(new Image("button"));
 
-            Image img = new Image(Draw.region("icon-chat"));
+            Image img = new Image(Core.atlas.find("icon-chat"));
             img.setScaling(Scaling.fill);
 
             stack.add(img);
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
index 4f83cd3557..8facc1eebd 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.Scaling;
+import io.anuke.arc.util.Scaling;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.io.MapIO;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java
index a5b20b98dd..9a6c9e745a 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.game.Saves.SaveSlot;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.scene.ui.TextButton;
 import io.anuke.arc.util.Bundles;
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
index 9e4eb6b90a..b9ef625a92 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
@@ -4,11 +4,11 @@ import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.GridPoint2;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Align;
+import io.anuke.arc.util.Align;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.maps.Sector;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.scene.Element;
 import io.anuke.arc.scene.Group;
@@ -21,7 +21,7 @@ import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.scene.utils.Cursors;
 import io.anuke.arc.util.Bundles;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.world;
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
index 22445262f6..7aea515d55 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -3,13 +3,11 @@ package io.anuke.mindustry.ui.dialogs;
 import io.anuke.arc.Core;
 import io.anuke.arc.Input.Keys;
 import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.utils.Align;
+import io.anuke.arc.util.Align;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.net.Net;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Settings;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.scene.Element;
 import io.anuke.arc.scene.event.InputEvent;
@@ -21,7 +19,7 @@ import io.anuke.arc.scene.ui.SettingsDialog.SettingsTable.Setting;
 import io.anuke.arc.scene.ui.Slider;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.util.Bundles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
index 2f7ab00a02..1c300a2d8e 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.ui.dialogs;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.game.UnlockableContent;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java
index bc74b9b78e..c6ad183518 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java
@@ -5,8 +5,8 @@ import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.graphics.Shaders;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Core;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
 import io.anuke.arc.scene.Group;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
index 1b0b3a8d88..51ca195c29 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
@@ -3,14 +3,13 @@ package io.anuke.mindustry.ui.fragments;
 import io.anuke.arc.Core;
 import io.anuke.arc.math.Interpolation;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Align;
+import io.anuke.arc.util.Align;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.input.InputHandler;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.scene.Element;
 import io.anuke.arc.scene.Group;
 import io.anuke.arc.scene.actions.Actions;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java
index af1d5108d8..93d1558aa0 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java
@@ -3,15 +3,15 @@ package io.anuke.mindustry.ui.fragments;
 import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Align;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.util.Align;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.consumers.Consume;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.scene.Element;
 import io.anuke.arc.scene.Group;
 import io.anuke.arc.scene.ui.layout.Table;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
index 703f77333a..660a523e01 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
@@ -2,8 +2,8 @@ package io.anuke.mindustry.ui.fragments;
 
 import io.anuke.arc.math.Interpolation;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Align;
-import io.anuke.arc.utils.IntSet;
+import io.anuke.arc.util.Align;
+import io.anuke.arc.util.IntSet;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.core.GameState.State;
@@ -13,8 +13,8 @@ import io.anuke.mindustry.input.InputHandler;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.ui.ItemImage;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.function.BooleanProvider;
 import io.anuke.arc.scene.Group;
 import io.anuke.arc.scene.actions.Actions;
@@ -23,7 +23,7 @@ import io.anuke.arc.scene.event.InputEvent;
 import io.anuke.arc.scene.event.InputListener;
 import io.anuke.arc.scene.event.Touchable;
 import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Strings;
 
 import static io.anuke.mindustry.Vars.*;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
index 516c740f71..a4b9335560 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
@@ -6,15 +6,14 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.Batch;
 import io.anuke.arc.graphics.g2d.BitmapFont;
 import io.anuke.arc.graphics.g2d.GlyphLayout;
-import io.anuke.arc.utils.Align;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.util.Align;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
-import io.anuke.arc.core.Core;
-import io.anuke.arc.core.Inputs;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Inputs;
+import io.anuke.arc.Timers;
 import io.anuke.arc.scene.Group;
 import io.anuke.arc.scene.ui.Dialog;
 import io.anuke.arc.scene.ui.Label;
@@ -22,7 +21,7 @@ import io.anuke.arc.scene.ui.Label.LabelStyle;
 import io.anuke.arc.scene.ui.TextField;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.scene.ui.layout.Unit;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 import static io.anuke.arc.core.Core.scene;
@@ -71,21 +70,21 @@ public class ChatFragment extends Table{
 
         update(() -> {
 
-            if(Net.active() && Inputs.keyTap("chat")){
+            if(Net.active() && Core.input.keyTap("chat")){
                 toggle();
             }
 
             if(chatOpen){
-                if(Inputs.keyTap("chat_history_prev") && historyPos < history.size - 1){
+                if(Core.input.keyTap("chat_history_prev") && historyPos < history.size - 1){
                     if(historyPos == 0) history.set(0, chatfield.getText());
                     historyPos++;
                     updateChat();
                 }
-                if(Inputs.keyTap("chat_history_next") && historyPos > 0){
+                if(Core.input.keyTap("chat_history_next") && historyPos > 0){
                     historyPos--;
                     updateChat();
                 }
-                scrollPos = (int) Mathf.clamp(scrollPos + Inputs.getAxis("chat_scroll"), 0, Math.max(0, messages.size - messagesShown));
+                scrollPos = (int) Mathf.clamp(scrollPos + Core.input.getAxis("chat_scroll"), 0, Math.max(0, messages.size - messagesShown));
             }
         });
 
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index c1f8f49e6a..b460c47169 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -4,9 +4,9 @@ import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Interpolation;
-import io.anuke.arc.utils.Align;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.Scaling;
+import io.anuke.arc.util.Align;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.Scaling;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.game.EventType.StateChangeEvent;
 import io.anuke.mindustry.game.Team;
@@ -18,7 +18,7 @@ import io.anuke.mindustry.type.Recipe;
 import io.anuke.mindustry.ui.IntFormat;
 import io.anuke.mindustry.ui.Minimap;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
-import io.anuke.arc.core.*;
+import io.anuke.arc.*;
 import io.anuke.arc.graphics.Hue;
 import io.anuke.arc.scene.Element;
 import io.anuke.arc.scene.Group;
@@ -32,7 +32,7 @@ import io.anuke.arc.scene.ui.layout.Stack;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.util.Bundles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -109,7 +109,7 @@ public class HudFragment extends Fragment{
             }
 
             cont.update(() -> {
-                if(!Inputs.keyDown("gridMode") && Inputs.keyTap("toggle_menus") && !ui.chatfrag.chatOpen()){
+                if(!Core.input.keyDown("gridMode") && Core.input.keyTap("toggle_menus") && !ui.chatfrag.chatOpen()){
                     toggleMenus();
                 }
             });
diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
index b99deb4d7b..54c6adc220 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
@@ -8,7 +8,7 @@ import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.ui.MenuButton;
 import io.anuke.mindustry.ui.MobileButton;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
-import io.anuke.arc.core.Events;
+import io.anuke.arc.Events;
 import io.anuke.arc.scene.Group;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.util.Strings;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
index c60d71f3da..c6e95f1049 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
@@ -3,7 +3,7 @@ package io.anuke.mindustry.ui.fragments;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.Interpolation;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;
@@ -16,9 +16,9 @@ import io.anuke.mindustry.ui.ImageStack;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.OreBlock;
-import io.anuke.arc.core.Events;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Inputs;
+import io.anuke.arc.Events;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Inputs;
 import io.anuke.arc.input.Input;
 import io.anuke.arc.scene.Group;
 import io.anuke.arc.scene.actions.Actions;
@@ -64,18 +64,18 @@ public class PlacementFragment extends Fragment{
     }
 
     boolean gridUpdate(InputHandler input){
-        if(!Inputs.keyDown("gridMode") || ui.chatfrag.chatOpen()) return false;
-        if(Inputs.keyDown("gridModeShift")){ //select category
+        if(!Core.input.keyDown("gridMode") || ui.chatfrag.chatOpen()) return false;
+        if(Core.input.keyDown("gridModeShift")){ //select category
             int i = 0;
             for(Input key : inputCatGrid){
-                if(Inputs.keyDown(key)){
+                if(Core.input.keyDown(key)){
                     input.recipe = Recipe.getByCategory(Category.values()[i]).first();
                     currentCategory = input.recipe.category;
                 }
                 i++;
             }
             return true;
-        }else if(Inputs.keyDown("select")){ //mouse eyedropper select
+        }else if(Core.input.keyDown("select")){ //mouse eyedropper select
             Tile tile = world.tileWorld(Graphics.mouseWorld().x, Graphics.mouseWorld().y);
 
             if(tile != null){
@@ -91,7 +91,7 @@ public class PlacementFragment extends Fragment{
             int i = 0;
             Array<Recipe> recipes = Recipe.getByCategory(currentCategory);
             for(Input key : inputGrid){
-                if(Inputs.keyDown(key))
+                if(Core.input.keyDown(key))
                     input.recipe = (i < recipes.size && control.unlocks.isUnlocked(recipes.get(i))) ? recipes.get(i) : null;
                 i++;
             }
diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
index d11ec99849..4eef86bf22 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
@@ -8,7 +8,7 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.net.NetConnection;
 import io.anuke.mindustry.net.Packets.AdminAction;
-import io.anuke.arc.core.Core;
+import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.scene.Group;
diff --git a/core/src/io/anuke/mindustry/world/BaseBlock.java b/core/src/io/anuke/mindustry/world/BaseBlock.java
index f24d04f1a8..d868d9a2d3 100644
--- a/core/src/io/anuke/mindustry/world/BaseBlock.java
+++ b/core/src/io/anuke/mindustry/world/BaseBlock.java
@@ -1,6 +1,10 @@
 package io.anuke.mindustry.world;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.entities.Effects;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.Vector2;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.fx.EnvironmentFx;
 import io.anuke.mindustry.entities.TileEntity;
@@ -13,10 +17,6 @@ import io.anuke.mindustry.world.consumers.ConsumeItem;
 import io.anuke.mindustry.world.consumers.ConsumeLiquid;
 import io.anuke.mindustry.world.consumers.Consumers;
 import io.anuke.mindustry.world.meta.Producers;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
-import io.anuke.arc.util.Translator;
 
 public abstract class BaseBlock extends MappableContent{
     public boolean hasItems;
@@ -71,7 +71,7 @@ public abstract class BaseBlock extends MappableContent{
     }
 
     /**Returns offset for stack placement.*/
-    public void getStackOffset(Item item, Tile tile, Translator trns){
+    public void getStackOffset(Item item, Tile tile, Vector2 trns){
 
     }
 
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index ce4743c663..211366df94 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -1,9 +1,17 @@
 package io.anuke.mindustry.world;
 
+import io.anuke.arc.Core;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.EnumSet;
+import io.anuke.arc.collection.IntArray;
 import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.Draw;
+import io.anuke.arc.graphics.Hue;
+import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntArray;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.scene.ui.layout.Table;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.entities.Damage;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.entities.TileEntity;
@@ -21,14 +29,6 @@ import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.world.meta.*;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.graphics.Hue;
-import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.util.Bundles;
-import io.anuke.arc.util.EnumSet;
-import io.anuke.arc.util.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -260,8 +260,8 @@ public class Block extends BaseBlock {
 
     @Override
     public void load(){
-        shadowRegion = Draw.region(shadow == null ? "shadow-" + size : shadow);
-        region = Draw.region(name);
+        shadowRegion = Core.atlas.find(shadow == null ? "shadow-" + size : shadow);
+        region = Core.atlas.find(name);
     }
 
     /**Called when the world is resized.
@@ -319,8 +319,7 @@ public class Block extends BaseBlock {
     public void drawConfigure(Tile tile){
         Draw.color(Palette.accent);
         Lines.stroke(1f);
-        Lines.square(tile.drawx(), tile.drawy(),
-                tile.block().size * tilesize / 2f + 1f);
+        Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1f);
         Draw.reset();
     }
 
@@ -465,7 +464,7 @@ public class Block extends BaseBlock {
 
     public TextureRegion getEditorIcon(){
         if(editorIcon == null){
-            editorIcon = Draw.region("block-icon-" + name, Draw.region("clear"));
+            editorIcon = Core.atlas.find("block-icon-" + name, Core.atlas.find("clear"));
         }
         return editorIcon;
     }
@@ -474,11 +473,11 @@ public class Block extends BaseBlock {
     public TextureRegion[] getIcon(){
         if(icon == null){
             if(Draw.hasRegion(name + "-icon")){
-                icon = new TextureRegion[]{Draw.region(name + "-icon")};
+                icon = new TextureRegion[]{Core.atlas.find(name + "-icon")};
             }else if(Draw.hasRegion(name)){
-                icon = new TextureRegion[]{Draw.region(name)};
+                icon = new TextureRegion[]{Core.atlas.find(name)};
             }else if(Draw.hasRegion(name + "1")){
-                icon = new TextureRegion[]{Draw.region(name + "1")};
+                icon = new TextureRegion[]{Core.atlas.find(name + "1")};
             }else{
                 icon = new TextureRegion[]{};
             }
diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java
index d847e29e75..5aebf6c2b6 100644
--- a/core/src/io/anuke/mindustry/world/Build.java
+++ b/core/src/io/anuke/mindustry/world/Build.java
@@ -10,7 +10,7 @@ import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Recipe;
 import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
-import io.anuke.arc.core.Events;
+import io.anuke.arc.Events;
 import io.anuke.arc.util.Geometry;
 
 import static io.anuke.mindustry.Vars.*;
diff --git a/core/src/io/anuke/mindustry/world/ColorMapper.java b/core/src/io/anuke/mindustry/world/ColorMapper.java
index a82a232668..a9b1926b3a 100644
--- a/core/src/io/anuke/mindustry/world/ColorMapper.java
+++ b/core/src/io/anuke/mindustry/world/ColorMapper.java
@@ -1,8 +1,8 @@
 package io.anuke.mindustry.world;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.IntMap;
-import io.anuke.arc.utils.ObjectIntMap;
+import io.anuke.arc.util.IntMap;
+import io.anuke.arc.util.ObjectIntMap;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.type.ContentType;
diff --git a/core/src/io/anuke/mindustry/world/Edges.java b/core/src/io/anuke/mindustry/world/Edges.java
index d00cc85ee4..685b16e5c9 100644
--- a/core/src/io/anuke/mindustry/world/Edges.java
+++ b/core/src/io/anuke/mindustry/world/Edges.java
@@ -1,9 +1,9 @@
 package io.anuke.mindustry.world;
 
-import io.anuke.arc.math.GridPoint2;
-import io.anuke.arc.math.Vector2;
-import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.GridPoint2;
+import io.anuke.arc.math.geom.Vector2;
 
 import java.util.Arrays;
 
diff --git a/core/src/io/anuke/mindustry/world/ItemBuffer.java b/core/src/io/anuke/mindustry/world/ItemBuffer.java
index 08e6ff824c..31fb5e96b8 100644
--- a/core/src/io/anuke/mindustry/world/ItemBuffer.java
+++ b/core/src/io/anuke/mindustry/world/ItemBuffer.java
@@ -1,8 +1,8 @@
 package io.anuke.mindustry.world;
 
-import io.anuke.arc.utils.NumberUtils;
+import io.anuke.arc.util.NumberUtils;
 import io.anuke.mindustry.type.Item;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.util.Bits;
 import static io.anuke.mindustry.Vars.*;
 
diff --git a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java
index c61a608652..eb5ea49a0c 100644
--- a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java
+++ b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.world;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.arc.utils.IntMap;
+import io.anuke.arc.util.IntMap;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.blocks.OreBlocks;
diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java
index 0cff80e015..256e08f141 100644
--- a/core/src/io/anuke/mindustry/world/Tile.java
+++ b/core/src/io/anuke/mindustry/world/Tile.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.world;
 
 import io.anuke.arc.math.GridPoint2;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.traits.TargetTrait;
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index 4a23cb0ee6..5bd515f05f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -24,11 +24,11 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockBar;
 import io.anuke.mindustry.world.modules.ItemModule;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.util.Bundles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java
index 9a037d5038..20f6b34100 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Floor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java
@@ -1,23 +1,23 @@
 package io.anuke.mindustry.world.blocks;
 
+import io.anuke.arc.Core;
+import io.anuke.arc.collection.IntIntMap;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.function.BiPredicate;
+import io.anuke.arc.function.Predicate;
 import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.math.MathUtils;
-import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.IntIntMap;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.math.geom.Vector2;
+import io.anuke.arc.util.Structs;
 import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.content.fx.BlockFx;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.type.StatusEffect;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.function.BiPredicate;
-import io.anuke.arc.function.Predicate;
-import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Structs;
-import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
 
 public class Floor extends Block{
     //TODO implement proper bitmasking
@@ -75,7 +75,7 @@ public class Floor extends Block{
         super.load();
 
         if(blend){
-            edgeRegion = Draw.hasRegion(name + "edge") ? Draw.region(name + "edge") : Draw.region(edge + "edge");
+            edgeRegion = Draw.hasRegion(name + "edge") ? Core.atlas.find(name + "edge") : Core.atlas.find(edge + "edge");
             edgeRegions = new TextureRegion[8];
             offsets = new Vector2[8];
 
@@ -93,17 +93,17 @@ public class Floor extends Block{
                 float ry = Mathf.clamp(dy * 8, 0, 8 - h);
 
                 result.setTexture(edgeRegion.getTexture());
-                result.setRegion(edgeRegion.getRegionX() + x, edgeRegion.getRegionY() + y + h, w, -h);
+                result.set(edgeRegion.getX() + x, edgeRegion.getY() + y + h, w, -h);
 
                 edgeRegions[i] = result;
                 offsets[i] = new Vector2(-4 + rx, -4 + ry);
             }
 
             cliffRegions = new TextureRegion[4];
-            cliffRegions[0] = Draw.region(name + "-cliff-edge-2");
-            cliffRegions[1] = Draw.region(name + "-cliff-edge");
-            cliffRegions[2] = Draw.region(name + "-cliff-edge-1");
-            cliffRegions[3] = Draw.region(name + "-cliff-side");
+            cliffRegions[0] = Core.atlas.find(name + "-cliff-edge-2");
+            cliffRegions[1] = Core.atlas.find(name + "-cliff-edge");
+            cliffRegions[2] = Core.atlas.find(name + "-cliff-edge-1");
+            cliffRegions[3] = Core.atlas.find(name + "-cliff-side");
         }
 
         //load variant regions for drawing
@@ -111,11 +111,11 @@ public class Floor extends Block{
             variantRegions = new TextureRegion[variants];
 
             for(int i = 0; i < variants; i++){
-                variantRegions[i] = Draw.region(name + (i + 1));
+                variantRegions[i] = Core.atlas.find(name + (i + 1));
             }
         }else{
             variantRegions = new TextureRegion[1];
-            variantRegions[0] = Draw.region(name);
+            variantRegions[0] = Core.atlas.find(name);
         }
     }
 
@@ -130,14 +130,14 @@ public class Floor extends Block{
 
     @Override
     public void drawNonLayer(Tile tile){
-        MathUtils.random.setSeed(tile.pos());
+        Mathf.random.setSeed(tile.pos());
 
         drawEdges(tile, true);
     }
 
     @Override
     public void draw(Tile tile){
-        MathUtils.random.setSeed(tile.pos());
+        Mathf.random.setSeed(tile.pos());
 
         Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java b/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java
index a65b937883..1e5e020089 100644
--- a/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java
@@ -23,14 +23,14 @@ public class LiquidBlock extends Block{
     public void load(){
         super.load();
 
-        liquidRegion = Draw.region(name + "-liquid");
-        topRegion = Draw.region(name + "-top");
-        bottomRegion = Draw.region(name + "-bottom");
+        liquidRegion = Core.atlas.find(name + "-liquid");
+        topRegion = Core.atlas.find(name + "-top");
+        bottomRegion = Core.atlas.find(name + "-bottom");
     }
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name() + "-bottom"), Draw.region(name() + "-top")};
+        return new TextureRegion[]{Core.atlas.find(name() + "-bottom"), Core.atlas.find(name() + "-top")};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java
index 5129e2bbdc..ceab37ed65 100644
--- a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java
@@ -7,7 +7,7 @@ import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class OreBlock extends Floor{
     public Floor base;
diff --git a/core/src/io/anuke/mindustry/world/blocks/Rock.java b/core/src/io/anuke/mindustry/world/blocks/Rock.java
index c616fd0433..5f62632461 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Rock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Rock.java
@@ -4,7 +4,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class Rock extends Block{
     protected TextureRegion[] shadowRegions, regions;
@@ -43,8 +43,8 @@ public class Rock extends Block{
             regions = new TextureRegion[variants];
 
             for(int i = 0; i < variants; i++){
-                shadowRegions[i] = Draw.region(name + "shadow" + (i + 1));
-                regions[i] = Draw.region(name + (i + 1));
+                shadowRegions[i] = Core.atlas.find(name + "shadow" + (i + 1));
+                regions[i] = Core.atlas.find(name + (i + 1));
             }
         }
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
index a7e932149f..177ce8a5ce 100644
--- a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
+++ b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.blocks;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.type.Item;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.function.Supplier;
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java
index 2f469e93cd..6f0553d4e6 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java
@@ -7,10 +7,10 @@ import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Physics;
 
 import static io.anuke.mindustry.Vars.tilesize;
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java
index ed6498da21..8ae8f581e3 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java
@@ -8,8 +8,8 @@ import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.input.CursorType;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 
 import java.io.DataInput;
@@ -36,7 +36,7 @@ public class Door extends Wall{
     @Override
     public void load(){
         super.load();
-        openRegion = Draw.region(name + "-open");
+        openRegion = Core.atlas.find(name + "-open");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
index d7ca799ded..ea488388be 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
@@ -14,16 +14,16 @@ import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter;
 import io.anuke.mindustry.world.meta.BlockBar;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.entities.EntityQuery;
 import io.anuke.arc.entities.impl.BaseEntity;
 import io.anuke.arc.entities.trait.DrawTrait;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -60,7 +60,7 @@ public class ForceProjector extends Block {
     @Override
     public void load(){
         super.load();
-        topRegion = Draw.region(name + "-top");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
index 225d9b7993..23e3cd66eb 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
@@ -3,18 +3,18 @@ package io.anuke.mindustry.world.blocks.defense;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.IntSet;
+import io.anuke.arc.util.IntSet;
 import io.anuke.mindustry.content.fx.BlockFx;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Hue;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -50,7 +50,7 @@ public class MendProjector extends Block{
     @Override
     public void load(){
         super.load();
-        topRegion = Draw.region(name + "-top");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java
index 8a633ea66b..e5c63b9751 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java
@@ -3,18 +3,18 @@ package io.anuke.mindustry.world.blocks.defense;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.IntSet;
+import io.anuke.arc.util.IntSet;
 import io.anuke.mindustry.content.fx.BlockFx;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Hue;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -51,7 +51,7 @@ public class OverdriveProjector extends Block{
     @Override
     public void load(){
         super.load();
-        topRegion = Draw.region(name + "-top");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java b/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java
index 225041ef45..650c6bb6e0 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java
@@ -8,7 +8,7 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class ShockMine extends Block{
     protected int timerDamage = timers ++;
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java
index ff62f9d2bc..307afd4425 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java
@@ -4,7 +4,7 @@ import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.effect.Lightning;
 import io.anuke.mindustry.graphics.Palette;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class SurgeWall extends Wall{
     protected float lightningChance = 0.05f;
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java
index a9ae8bf536..363f77528c 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java
@@ -5,7 +5,7 @@ import io.anuke.mindustry.entities.Predict;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.tilesize;
 
@@ -33,7 +33,7 @@ public class ArtilleryTurret extends ItemTurret{
 
         Vector2 predict = Predict.intercept(tile, entity.target, type.bullet.speed);
 
-        float dst = entity.distanceTo(predict.x, predict.y);
+        float dst = entity.dst(predict.x, predict.y);
         float maxTraveled = type.bullet.lifetime * type.bullet.speed;
 
         for(int i = 0; i < shots; i++){
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java
index 172b0294b4..9a0ad9a1b1 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java
@@ -2,8 +2,8 @@ package io.anuke.mindustry.world.blocks.defense.turrets;
 
 import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Timers;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.tilesize;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java
index ab3718b47e..89c4fb758f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java
@@ -4,10 +4,10 @@ import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.tilesize;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java
index dd98334f61..ec9c5c466b 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java
@@ -4,10 +4,10 @@ import io.anuke.mindustry.content.fx.BlockFx;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.tilesize;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java
index 9fc55716ca..1819857ad7 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.world.blocks.defense.turrets;
 
 import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.tilesize;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java
index ae6938bc1f..28676ec0cc 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.blocks.defense.turrets;
 
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.type.AmmoEntry;
 import io.anuke.mindustry.type.AmmoType;
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java
index c9e9fda485..c0bc442d89 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java
@@ -7,10 +7,10 @@ import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Timers;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.tilesize;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index b1b17ff3f1..ff39c10589 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.blocks.defense.turrets;
 
-import io.anuke.arc.utils.ObjectMap;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.mindustry.entities.effect.Fire;
 import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.type.Item;
@@ -10,7 +10,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockBar;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.values.LiquidFilterValue;
-import io.anuke.arc.core.Effects;
+import io.anuke.arc.Effects;
 
 import static io.anuke.mindustry.Vars.tilesize;
 import static io.anuke.mindustry.Vars.world;
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
index b0fd1105b2..00cdcb706a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
@@ -3,7 +3,7 @@ package io.anuke.mindustry.world.blocks.defense.turrets;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Vector2;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.entities.Predict;
 import io.anuke.mindustry.entities.TileEntity;
@@ -22,10 +22,10 @@ import io.anuke.mindustry.world.meta.BlockFlag;
 import io.anuke.mindustry.world.meta.BlockGroup;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.function.BiConsumer;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
@@ -106,9 +106,9 @@ public abstract class Turret extends Block{
     public void load(){
         super.load();
 
-        baseRegion = Draw.region("block-" + size);
-        baseTopRegion = Draw.region("block-" + size + "-top");
-        heatRegion = Draw.region(name + "-heat");
+        baseRegion = Core.atlas.find("block-" + size);
+        baseTopRegion = Core.atlas.find("block-" + size + "-top");
+        heatRegion = Core.atlas.find(name + "-heat");
     }
 
     @Override
@@ -142,7 +142,7 @@ public abstract class Turret extends Block{
 
         drawer.accept(tile, entity);
 
-        if(heatRegion != Draw.region("error")){
+        if(heatRegion != Core.atlas.find("error")){
             heatDrawer.accept(tile, entity);
         }
 
@@ -152,7 +152,7 @@ public abstract class Turret extends Block{
     @Override
     public TextureRegion[] getBlockIcon(){
         if(blockIcon == null){
-            blockIcon = new TextureRegion[]{Draw.region("block-icon-" + name)};
+            blockIcon = new TextureRegion[]{Core.atlas.find("block-icon-" + name)};
         }
         return blockIcon;
     }
@@ -160,7 +160,7 @@ public abstract class Turret extends Block{
     @Override
     public TextureRegion[] getCompactIcon(){
         if(compactIcon == null){
-            compactIcon = new TextureRegion[]{iconRegion(Draw.region("block-icon-" + name))};
+            compactIcon = new TextureRegion[]{iconRegion(Core.atlas.find("block-icon-" + name))};
         }
         return compactIcon;
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java
index e11a2570ea..1980195b30 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java
@@ -4,7 +4,7 @@ import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.ItemBuffer;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class BufferedItemBridge extends ExtendingItemBridge{
     protected int timerAccept = timers++;
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
index 50eb9759d9..fa296100e3 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
@@ -7,7 +7,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.LiquidBlock;
 import io.anuke.mindustry.world.modules.LiquidModule;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -30,10 +30,10 @@ public class Conduit extends LiquidBlock{
     public void load(){
         super.load();
 
-        liquidRegion = Draw.region("conduit-liquid");
+        liquidRegion = Core.atlas.find("conduit-liquid");
         for(int i = 0; i < topRegions.length; i++){
-            topRegions[i] = Draw.region(name + "-top-" + i);
-            botRegions[i] = Draw.region("conduit-bottom-" + i);
+            topRegions[i] = Core.atlas.find(name + "-top-" + i);
+            botRegions[i] = Core.atlas.find("conduit-bottom-" + i);
         }
     }
 
@@ -113,7 +113,7 @@ public class Conduit extends LiquidBlock{
     @Override
     public TextureRegion[] getIcon(){
         if(icon == null){
-            icon = new TextureRegion[]{Draw.region("conduit-bottom"), Draw.region(name + "-top-0")};
+            icon = new TextureRegion[]{Core.atlas.find("conduit-bottom"), Core.atlas.find(name + "-top-0")};
         }
         return icon;
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
index 04a2ee25a1..99a590c651 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
@@ -1,8 +1,8 @@
 package io.anuke.mindustry.world.blocks.distribution;
 
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.LongArray;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.LongArray;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.graphics.Layer;
@@ -12,7 +12,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockGroup;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.util.*;
 
@@ -68,7 +68,7 @@ public class Conveyor extends Block{
 
         for(int i = 0; i < regions.length; i++){
             for(int j = 0; j < 4; j++){
-                regions[i][j] = Draw.region(name + "-" + i + "-" + j);
+                regions[i][j] = Core.atlas.find(name + "-" + i + "-" + j);
             }
         }
     }
@@ -139,7 +139,7 @@ public class Conveyor extends Block{
     @Override
     public TextureRegion[] getIcon(){
         if(icon == null){
-            icon = new TextureRegion[]{Draw.region(name + "-0-0")};
+            icon = new TextureRegion[]{Core.atlas.find(name + "-0-0")};
         }
         return super.getIcon();
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java
index 2f41b4eac0..d9cd93c407 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java
@@ -5,7 +5,7 @@ import io.anuke.arc.graphics.CapStyle;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.tilesize;
 import static io.anuke.mindustry.Vars.world;
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
index 219da66646..8b198e0ba3 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
@@ -2,9 +2,9 @@ package io.anuke.mindustry.world.blocks.distribution;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.IntArray;
-import io.anuke.arc.utils.IntSet;
-import io.anuke.arc.utils.IntSet.IntSetIterator;
+import io.anuke.arc.util.IntArray;
+import io.anuke.arc.util.IntSet;
+import io.anuke.arc.util.IntSet.IntSetIterator;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.entities.Player;
@@ -18,12 +18,12 @@ import io.anuke.mindustry.world.Edges;
 import io.anuke.mindustry.world.Pos;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockGroup;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.CapStyle;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -77,9 +77,9 @@ public class ItemBridge extends Block{
     public void load(){
         super.load();
 
-        endRegion = Draw.region(name + "-end");
-        bridgeRegion = Draw.region(name + "-bridge");
-        arrowRegion = Draw.region(name + "-arrow");
+        endRegion = Core.atlas.find(name + "-end");
+        bridgeRegion = Core.atlas.find(name + "-bridge");
+        arrowRegion = Core.atlas.find(name + "-arrow");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java
index 166352f2b9..0815fd8db1 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java
@@ -1,12 +1,12 @@
 package io.anuke.mindustry.world.blocks.distribution;
 
-import io.anuke.arc.utils.NumberUtils;
+import io.anuke.arc.util.NumberUtils;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockGroup;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.util.Bits;
 
 import static io.anuke.mindustry.Vars.content;
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java
index 2e06ade6af..ce48244cfe 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java
@@ -4,8 +4,8 @@ import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockGroup;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Timers;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.world;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java
index c23fd46895..2be21c79f5 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java
@@ -1,13 +1,13 @@
 package io.anuke.mindustry.world.blocks.distribution;
 
-import io.anuke.arc.utils.IntSet.IntSetIterator;
+import io.anuke.arc.util.IntSet.IntSetIterator;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Pos;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockGroup;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Timers;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.world;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java
index 231e8fa68e..83748ebe30 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java
@@ -34,7 +34,7 @@ public class LiquidJunction extends LiquidBlock{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name)};
+        return new TextureRegion[]{Core.atlas.find(name)};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
index 4dcd94574f..0a89bc9d9a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
@@ -2,8 +2,8 @@ package io.anuke.mindustry.world.blocks.distribution;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.ObjectSet;
-import io.anuke.arc.utils.Pool.Poolable;
+import io.anuke.arc.collection.ObjectSet;
+import io.anuke.arc.util.Pool.Poolable;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.bullets.TurretBullets;
@@ -21,13 +21,13 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Pooling;
 
 import java.io.DataInput;
@@ -119,7 +119,7 @@ public class MassDriver extends Block{
     public void load(){
         super.load();
 
-        turretRegion = Draw.region(name + "-turret");
+        turretRegion = Core.atlas.find(name + "-turret");
     }
 
     @Override
@@ -228,7 +228,7 @@ public class MassDriver extends Block{
         if(entity.link == other.pos()){
             Call.linkMassDriver(null, tile, -1);
             return false;
-        }else if(other.block() instanceof MassDriver && other.distanceTo(tile) <= range){
+        }else if(other.block() instanceof MassDriver && other.dst(tile) <= range){
             Call.linkMassDriver(null, tile, other.pos());
             return false;
         }
@@ -259,7 +259,7 @@ public class MassDriver extends Block{
         if(entity == null || entity.link == -1) return false;
         Tile link = world.tile(entity.link);
 
-        return link != null && link.block() instanceof MassDriver && tile.distanceTo(link) <= range;
+        return link != null && link.block() instanceof MassDriver && tile.dst(link) <= range;
     }
 
     public static class DriverBulletData implements Poolable{
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
index c7787a9431..c54d42daae 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
@@ -3,8 +3,8 @@ package io.anuke.mindustry.world.blocks.distribution;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Edges;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Timers;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.Timers;
+import io.anuke.arc.math.Mathf;
 
 public class OverflowGate extends Router{
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
index 9bf005e445..8d241b5a69 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.blocks.distribution;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.BarType;
@@ -8,7 +8,7 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Edges;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockGroup;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 
 public class Router extends Block{
     protected float speed = 8f;
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
index e5e08293fb..16b0b26eff 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
@@ -12,7 +12,7 @@ import io.anuke.mindustry.world.blocks.SelectionTrait;
 import io.anuke.mindustry.world.meta.BlockGroup;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java
index e57c843265..43bbe1e208 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java
@@ -7,10 +7,10 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.production.GenericCrafter.GenericCrafterEntity;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class FusionReactor extends PowerGenerator{
     protected int plasmas = 4;
@@ -104,7 +104,7 @@ public class FusionReactor extends PowerGenerator{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name + "-bottom"), Draw.region(name), Draw.region(name + "-top")};
+        return new TextureRegion[]{Core.atlas.find(name + "-bottom"), Core.atlas.find(name), Core.atlas.find(name + "-top")};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
index 6a7641ac9f..c0dcc8f938 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
@@ -11,11 +11,11 @@ import io.anuke.mindustry.world.consumers.ConsumeItemFilter;
 import io.anuke.mindustry.world.meta.BlockBar;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -43,7 +43,7 @@ public abstract class ItemGenerator extends PowerGenerator{
     @Override
     public void load(){
         super.load();
-        topRegion = Draw.region(name + "-top");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
index b637954bbd..a404962a93 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
@@ -5,9 +5,9 @@ import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter;
-import io.anuke.arc.core.Effects;
+import io.anuke.arc.Effects;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.content;
 import static io.anuke.mindustry.Vars.tilesize;
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java
index 50ef97a01a..287e0f6b49 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java
@@ -6,10 +6,10 @@ import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.power.ItemGenerator.ItemGeneratorEntity;
 import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public abstract class LiquidGenerator extends PowerGenerator{
     protected float minEfficiency = 0.2f;
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
index 9bb7f0e7f3..0876fe459c 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
@@ -14,10 +14,10 @@ import io.anuke.mindustry.world.meta.BlockBar;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
 import io.anuke.mindustry.world.meta.values.LiquidFilterValue;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Translator;
 
 import java.io.DataInput;
@@ -60,8 +60,8 @@ public class NuclearReactor extends PowerGenerator{
     public void load(){
         super.load();
 
-        topRegion = Draw.region(name + "-center");
-        lightsRegion = Draw.region(name + "-lights");
+        topRegion = Core.atlas.find(name + "-center");
+        lightsRegion = Core.atlas.find(name + "-lights");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
index c1e59a9431..71e0dce62b 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
@@ -1,9 +1,9 @@
 package io.anuke.mindustry.world.blocks.power;
 
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.IntSet;
-import io.anuke.arc.utils.ObjectSet;
-import io.anuke.arc.utils.Queue;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.IntSet;
+import io.anuke.arc.collection.ObjectSet;
+import io.anuke.arc.util.Queue;
 import io.anuke.mindustry.world.Tile;
 
 import static io.anuke.mindustry.Vars.threads;
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
index db85f4a8d2..edc52a8295 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
@@ -12,12 +12,12 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.PowerBlock;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Settings;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Settings;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Angles;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Translator;
 
 import static io.anuke.mindustry.Vars.*;
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java
index f915af34f6..4e3d182a27 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java
@@ -3,7 +3,7 @@ package io.anuke.mindustry.world.blocks.power;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.util.EnumSet;
 
 public class SolarGenerator extends PowerGenerator{
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java b/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java
index a15864b4a6..411ff97264 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java
@@ -5,7 +5,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.production.GenericCrafter.GenericCrafterEntity;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class Compressor extends PowerCrafter{
     protected TextureRegion liquidRegion, topRegion;
@@ -22,11 +22,11 @@ public class Compressor extends PowerCrafter{
 
         frameRegions = new TextureRegion[3];
         for(int i = 0; i < 3; i++){
-            frameRegions[i] = Draw.region(name + "-frame" + i);
+            frameRegions[i] = Core.atlas.find(name + "-frame" + i);
         }
 
-        liquidRegion = Draw.region(name + "-liquid");
-        topRegion = Draw.region(name + "-top");
+        liquidRegion = Core.atlas.find(name + "-liquid");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
@@ -43,6 +43,6 @@ public class Compressor extends PowerCrafter{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name), Draw.region(name + "-top")};
+        return new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-top")};
     }
 }
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java
index 55b5e4cb1f..e0c27f2399 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java
@@ -9,10 +9,10 @@ import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockStat;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.SeedRandom;
 
 import java.io.DataInput;
@@ -50,8 +50,8 @@ public class Cultivator extends Drill{
     public void load(){
         super.load();
 
-        middleRegion = Draw.region(name + "-middle");
-        topRegion = Draw.region(name + "-top");
+        middleRegion = Core.atlas.find(name + "-middle");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
@@ -92,7 +92,7 @@ public class Cultivator extends Drill{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name), Draw.region(name + "-top"),};
+        return new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-top"),};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
index 50e0be317d..72de7e7c56 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
@@ -2,8 +2,8 @@ package io.anuke.mindustry.world.blocks.production;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.Array;
-import io.anuke.arc.utils.ObjectIntMap;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.util.ObjectIntMap;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.content.fx.BlockFx;
 import io.anuke.mindustry.entities.TileEntity;
@@ -16,12 +16,12 @@ import io.anuke.mindustry.world.consumers.ConsumeLiquid;
 import io.anuke.mindustry.world.meta.BlockGroup;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.content;
 public class Drill extends Block{
@@ -78,9 +78,9 @@ public class Drill extends Block{
     @Override
     public void load(){
         super.load();
-        rimRegion = Draw.region(name + "-rim");
-        rotatorRegion = Draw.region(name + "-rotator");
-        topRegion = Draw.region(name + "-top");
+        rimRegion = Core.atlas.find(name + "-rim");
+        rotatorRegion = Core.atlas.find(name + "-rotator");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
@@ -114,7 +114,7 @@ public class Drill extends Block{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name), Draw.region(name + "-rotator"), Draw.region(name + "-top")};
+        return new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-rotator"), Core.atlas.find(name + "-top")};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java b/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java
index fd20bb489b..aa43770e15 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java
@@ -27,9 +27,9 @@ public class Fracker extends SolidPump{
     public void load(){
         super.load();
 
-        liquidRegion = Draw.region(name + "-liquid");
-        rotatorRegion = Draw.region(name + "-rotator");
-        topRegion = Draw.region(name + "-top");
+        liquidRegion = Core.atlas.find(name + "-liquid");
+        rotatorRegion = Core.atlas.find(name + "-rotator");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
@@ -49,7 +49,7 @@ public class Fracker extends SolidPump{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name), Draw.region(name + "-rotator"), Draw.region(name + "-top")};
+        return new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-rotator"), Core.atlas.find(name + "-top")};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java
index 904a82fc40..a389cee2db 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java
@@ -12,11 +12,11 @@ import io.anuke.mindustry.world.consumers.ConsumeItem;
 import io.anuke.mindustry.world.meta.BlockBar;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -74,7 +74,7 @@ public class GenericCrafter extends Block{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name)};
+        return new TextureRegion[]{Core.atlas.find(name)};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java b/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java
index c1960cdeb7..2823cf018d 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java
@@ -8,12 +8,12 @@ import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.BarType;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class Incinerator extends Block{
     protected Effect effect = BlockFx.fuelburn;
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java b/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java
index ec4ae5efc5..85bf063719 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java
@@ -5,10 +5,10 @@ import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class PhaseWeaver extends PowerSmelter{
     protected TextureRegion bottomRegion;
@@ -22,14 +22,14 @@ public class PhaseWeaver extends PowerSmelter{
     public void load(){
         super.load();
 
-        bottomRegion = Draw.region(name + "-bottom");
-        weaveRegion = Draw.region(name + "-weave");
+        bottomRegion = Core.atlas.find(name + "-bottom");
+        weaveRegion = Core.atlas.find(name + "-weave");
     }
 
     @Override
     public TextureRegion[] getIcon(){
         if(icon == null){
-            icon = new TextureRegion[]{Draw.region(name + "-bottom"), Draw.region(name)};
+            icon = new TextureRegion[]{Core.atlas.find(name + "-bottom"), Core.atlas.find(name)};
         }
         return icon;
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java b/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java
index 05643bf14d..b16146360a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java
@@ -3,7 +3,7 @@ package io.anuke.mindustry.world.blocks.production;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class PlastaniumCompressor extends GenericCrafter{
     protected TextureRegion topRegion;
@@ -16,7 +16,7 @@ public class PlastaniumCompressor extends GenericCrafter{
     public void load(){
         super.load();
 
-        topRegion = Draw.region(name + "-top");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
index dc9b794842..c99df31618 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
@@ -12,12 +12,12 @@ import io.anuke.mindustry.world.blocks.PowerBlock;
 import io.anuke.mindustry.world.meta.BlockBar;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -66,7 +66,7 @@ public class PowerSmelter extends PowerBlock{
     @Override
     public void load(){
         super.load();
-        topRegion = Draw.region(name + "-top");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java b/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java
index 11aee84d76..cba0d12dd9 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java
@@ -16,7 +16,7 @@ public class Pulverizer extends GenericCrafter{
     public void load(){
         super.load();
 
-        rotatorRegion = Draw.region(name + "-rotator");
+        rotatorRegion = Core.atlas.find(name + "-rotator");
     }
 
     @Override
@@ -29,6 +29,6 @@ public class Pulverizer extends GenericCrafter{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name), Draw.region(name + "-rotator")};
+        return new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-rotator")};
     }
 }
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java
index 66f49d39f7..f01d0ccb07 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.world.blocks.production;
 
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.graphics.Layer;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
@@ -35,7 +35,7 @@ public class Pump extends LiquidBlock{
     public void load(){
         super.load();
 
-        liquidRegion = Draw.region("pump-liquid");
+        liquidRegion = Core.atlas.find("pump-liquid");
     }
 
     @Override
@@ -56,7 +56,7 @@ public class Pump extends LiquidBlock{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name)};
+        return new TextureRegion[]{Core.atlas.find(name)};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
index c87bd9374b..b6b1c715fb 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
@@ -14,7 +14,7 @@ import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.values.ItemFilterValue;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 /**
  * Extracts a random list of items from an input item and an input liquid.
@@ -49,7 +49,7 @@ public class Separator extends Block{
     public void load(){
         super.load();
 
-        liquidRegion = Draw.region(name + "-liquid");
+        liquidRegion = Core.atlas.find(name + "-liquid");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java
index e50fa95736..bee5fc971a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java
@@ -13,12 +13,12 @@ import io.anuke.mindustry.world.consumers.ConsumeItems;
 import io.anuke.mindustry.world.meta.BlockBar;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Fill;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
index cfb26702e0..e3b75d8bf1 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
@@ -7,10 +7,10 @@ import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockStat;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 /**
  * Pump that makes liquid from solids and takes in power. Only works on solid floor blocks.
@@ -30,7 +30,7 @@ public class SolidPump extends Pump{
     public void load(){
         super.load();
 
-        liquidRegion = Draw.region(name + "-liquid");
+        liquidRegion = Core.atlas.find(name + "-liquid");
     }
 
     @Override
@@ -56,7 +56,7 @@ public class SolidPump extends Pump{
 
     @Override
     public TextureRegion[] getIcon(){
-        return new TextureRegion[]{Draw.region(name), Draw.region(name + "-rotator"), Draw.region(name + "-top")};
+        return new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-rotator"), Core.atlas.find(name + "-top")};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
index ca25eb3a6b..bb70476530 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
@@ -22,13 +22,13 @@ import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.BarType;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.EnumSet;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -128,15 +128,15 @@ public class CoreBlock extends StorageBlock{
     public void load(){
         super.load();
 
-        openRegion = Draw.region(name + "-open");
-        topRegion = Draw.region(name + "-top");
+        openRegion = Core.atlas.find(name + "-open");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
     public void draw(Tile tile){
         CoreEntity entity = tile.entity();
 
-        Draw.rect(entity.solid ? Draw.region(name) : openRegion, tile.drawx(), tile.drawy());
+        Draw.rect(entity.solid ? Core.atlas.find(name) : openRegion, tile.drawx(), tile.drawy());
 
         Draw.alpha(entity.heat);
         Draw.rect(topRegion, tile.drawx(), tile.drawy());
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java
index c37347d70a..be761275ab 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java
@@ -2,7 +2,7 @@ package io.anuke.mindustry.world.blocks.units;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.fx.BlockFx;
@@ -16,8 +16,8 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.scene.ui.ButtonGroup;
 import io.anuke.arc.scene.ui.ImageButton;
@@ -61,7 +61,7 @@ public class CommandCenter extends Block{
         super.load();
 
         for(UnitCommand cmd : UnitCommand.values()){
-            commandRegions[cmd.ordinal()] = Draw.region("command-" + cmd.name());
+            commandRegions[cmd.ordinal()] = Core.atlas.find("command-" + cmd.name());
         }
     }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
index f273edd4e7..ad652291e1 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
@@ -19,13 +19,13 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.consumers.ConsumePowerExact;
 import io.anuke.mindustry.world.meta.BlockStat;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.Geometry;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -135,14 +135,14 @@ public class MechPad extends Block{
     @Override
     public void load(){
         super.load();
-        openRegion = Draw.region(name + "-open");
+        openRegion = Core.atlas.find(name + "-open");
     }
 
     @Override
     public void draw(Tile tile){
         MechFactoryEntity entity = tile.entity();
 
-        Draw.rect(Draw.region(name), tile.drawx(), tile.drawy(), entity.open ? 180f : 0f);
+        Draw.rect(Core.atlas.find(name), tile.drawx(), tile.drawy(), entity.open ? 180f : 0f);
 
         if(entity.player != null){
             TextureRegion region = mech.iconRegion;
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java
index 962d749a63..0966f28298 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java
@@ -15,13 +15,13 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Effects.Effect;
-import io.anuke.arc.core.Graphics;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Effects;
+import io.anuke.arc.entities.Effects.Effect;
+import io.anuke.arc.Graphics;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -126,7 +126,7 @@ public class Reconstructor extends Block{
     @Override
     public void load(){
         super.load();
-        openRegion = Draw.region(name + "-open");
+        openRegion = Core.atlas.find(name + "-open");
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
index 9ce7c5b569..976a13c56f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
@@ -11,13 +11,13 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
-import io.anuke.arc.core.Timers;
+import io.anuke.arc.Timers;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.graphics.Shapes;
 import io.anuke.arc.util.Angles;
 import io.anuke.arc.util.EnumSet;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 public class RepairPoint extends Block{
     private static Rectangle rect = new Rectangle();
@@ -45,7 +45,7 @@ public class RepairPoint extends Block{
     public void load(){
         super.load();
 
-        topRegion = Draw.region(name + "-turret");
+        topRegion = Core.atlas.find(name + "-turret");
     }
 
     @Override
@@ -83,7 +83,7 @@ public class RepairPoint extends Block{
     public void update(Tile tile){
         RepairPointEntity entity = tile.entity();
 
-        if(entity.target != null && (entity.target.isDead() || entity.target.distanceTo(tile) > repairRadius ||
+        if(entity.target != null && (entity.target.isDead() || entity.target.dst(tile) > repairRadius ||
                 entity.target.health >= entity.target.maxHealth())){
             entity.target = null;
         }else if(entity.target != null){
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
index 74c5938e9d..f97c2d5e00 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
@@ -23,12 +23,12 @@ import io.anuke.mindustry.world.meta.BlockFlag;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
 import io.anuke.mindustry.world.modules.ItemModule;
-import io.anuke.arc.core.Effects;
-import io.anuke.arc.core.Graphics;
+import io.anuke.arc.Effects;
+import io.anuke.arc.Graphics;
 import io.anuke.arc.graphics.Draw;
 import io.anuke.arc.graphics.Lines;
 import io.anuke.arc.util.EnumSet;
-import io.anuke.arc.util.Mathf;
+import io.anuke.arc.math.Mathf;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -81,7 +81,7 @@ public class UnitFactory extends Block{
     public void load(){
         super.load();
 
-        topRegion = Draw.region(name + "-top");
+        topRegion = Core.atlas.find(name + "-top");
     }
 
     @Override
@@ -107,8 +107,8 @@ public class UnitFactory extends Block{
     @Override
     public TextureRegion[] getIcon(){
         return new TextureRegion[]{
-            Draw.region(name),
-            Draw.region(name + "-top")
+            Core.atlas.find(name),
+            Core.atlas.find(name + "-top")
         };
     }
 
diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java
index bd7ad6a8ba..155a54e6ec 100644
--- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java
+++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.consumers;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Block;
diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java
index 632a21cfd0..9a663b4c6d 100644
--- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java
+++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.consumers;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Block;
diff --git a/core/src/io/anuke/mindustry/world/consumers/Consumers.java b/core/src/io/anuke/mindustry/world/consumers/Consumers.java
index d3276542bf..ed1ae99fe4 100644
--- a/core/src/io/anuke/mindustry/world/consumers/Consumers.java
+++ b/core/src/io/anuke/mindustry/world/consumers/Consumers.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.world.consumers;
 
-import io.anuke.arc.utils.ObjectMap;
-import io.anuke.arc.utils.ObjectSet;
+import io.anuke.arc.collection.ObjectMap;
+import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.type.Liquid;
diff --git a/core/src/io/anuke/mindustry/world/meta/BlockBars.java b/core/src/io/anuke/mindustry/world/meta/BlockBars.java
index 39e7078e15..c52700e31c 100644
--- a/core/src/io/anuke/mindustry/world/meta/BlockBars.java
+++ b/core/src/io/anuke/mindustry/world/meta/BlockBars.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.meta;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.world.BarType;
 
 public class BlockBars{
diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStats.java b/core/src/io/anuke/mindustry/world/meta/BlockStats.java
index aea14d7e50..515f528b52 100644
--- a/core/src/io/anuke/mindustry/world/meta/BlockStats.java
+++ b/core/src/io/anuke/mindustry/world/meta/BlockStats.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.world.meta;
 
-import io.anuke.arc.utils.ObjectMap.Entry;
-import io.anuke.arc.utils.OrderedMap;
+import io.anuke.arc.util.ObjectMap.Entry;
+import io.anuke.arc.util.OrderedMap;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.type.Liquid;
diff --git a/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java b/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java
index e41a3a307a..4aa7d9aef8 100644
--- a/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java
+++ b/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.meta.values;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.ui.ItemDisplay;
 import io.anuke.mindustry.world.meta.StatValue;
diff --git a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java b/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java
index becd6cb304..7d34d5049d 100644
--- a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java
+++ b/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.meta.values;
 
-import io.anuke.arc.utils.Array;
+import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.ui.LiquidDisplay;
 import io.anuke.mindustry.world.meta.StatValue;
diff --git a/core/src/io/anuke/mindustry/world/modules/PowerModule.java b/core/src/io/anuke/mindustry/world/modules/PowerModule.java
index 84a31a2df1..6cef939407 100644
--- a/core/src/io/anuke/mindustry/world/modules/PowerModule.java
+++ b/core/src/io/anuke/mindustry/world/modules/PowerModule.java
@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.modules;
 
-import io.anuke.arc.utils.IntArray;
+import io.anuke.arc.collection.IntArray;
 import io.anuke.mindustry.world.blocks.power.PowerGraph;
 
 import java.io.DataInput;
diff --git a/settings.gradle b/settings.gradle
index 88ac45956d..620b209a68 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,6 +21,10 @@ if(System.properties["release"] == null || System.properties["release"] == "fals
         project(':Arc').projectDir = new File(settingsDir, '../Arc')
         include ':Arc:core'
         project(':Arc:core').projectDir = new File(settingsDir, '../Arc/core')
+        include ':Arc:extensions'
+        project(':Arc:extensions').projectDir = new File(settingsDir, '../Arc/extensions')
+        include ':Arc:extensions:freetype'
+        project(':Arc:extensions:freetype').projectDir = new File(settingsDir, '../Arc/extensions/freetype')
     }
     if (new File(settingsDir, '../GDXGifRecorder').exists()) {
         include ':GDXGifRecorder'