diff --git a/core/build.gradle b/core/build.gradle
index 3dddd0fae5..abcec6d8f6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,8 +1,4 @@
 apply plugin: "java"
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-sourceSets.main.java.srcDirs = ["src/"]
-
-compileJava{
-//    options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
-}
\ No newline at end of file
+sourceSets.main.java.srcDirs = ["src/"]
\ No newline at end of file
diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java
index 55b37dcce8..9d27f6ace9 100644
--- a/core/src/io/anuke/mindustry/content/UnitTypes.java
+++ b/core/src/io/anuke/mindustry/content/UnitTypes.java
@@ -1,9 +1,9 @@
 package io.anuke.mindustry.content;
 
 import io.anuke.arc.collection.ObjectSet;
-import io.anuke.mindustry.entities.type.types.Crawler;
-import io.anuke.mindustry.type.UnitType;
+import io.anuke.mindustry.entities.type.base.*;
 import io.anuke.mindustry.game.ContentList;
+import io.anuke.mindustry.type.UnitType;
 
 public class UnitTypes implements ContentList{
     public static UnitType
@@ -13,7 +13,7 @@ public class UnitTypes implements ContentList{
 
     @Override
     public void load(){
-        spirit = new UnitType("spirit", io.anuke.mindustry.entities.type.types.Spirit.class, io.anuke.mindustry.entities.type.types.Spirit::new){{
+        spirit = new UnitType("spirit", Spirit.class, Spirit::new){{
             weapon = Weapons.healBlasterDrone;
             isFlying = true;
             drag = 0.01f;
@@ -23,7 +23,7 @@ public class UnitTypes implements ContentList{
             health = 60;
         }};
 
-        dagger = new UnitType("dagger", io.anuke.mindustry.entities.type.types.Dagger.class, io.anuke.mindustry.entities.type.types.Dagger::new){{
+        dagger = new UnitType("dagger", Dagger.class, Dagger::new){{
             maxVelocity = 1.1f;
             speed = 0.2f;
             drag = 0.4f;
@@ -33,7 +33,7 @@ public class UnitTypes implements ContentList{
             health = 130;
         }};
 
-        crawler = new UnitType("crawler", io.anuke.mindustry.entities.type.types.Crawler.class, Crawler::new){{
+        crawler = new UnitType("crawler", Crawler.class, Crawler::new){{
             maxVelocity = 1.1f;
             speed = 0.22f;
             drag = 0.4f;
@@ -43,7 +43,7 @@ public class UnitTypes implements ContentList{
             health = 100;
         }};
 
-        titan = new UnitType("titan", io.anuke.mindustry.entities.type.types.Titan.class, io.anuke.mindustry.entities.type.types.Titan::new){{
+        titan = new UnitType("titan", Titan.class, Titan::new){{
             maxVelocity = 0.8f;
             speed = 0.18f;
             drag = 0.4f;
@@ -55,7 +55,7 @@ public class UnitTypes implements ContentList{
             immunities.add(StatusEffects.burning);
         }};
 
-        fortress = new UnitType("fortress", io.anuke.mindustry.entities.type.types.Fortress.class, io.anuke.mindustry.entities.type.types.Fortress::new){{
+        fortress = new UnitType("fortress", Fortress.class, Fortress::new){{
             maxVelocity = 0.78f;
             speed = 0.15f;
             drag = 0.4f;
@@ -68,7 +68,7 @@ public class UnitTypes implements ContentList{
             health = 800;
         }};
 
-        eruptor = new UnitType("eruptor", io.anuke.mindustry.entities.type.types.Eruptor.class, io.anuke.mindustry.entities.type.types.Eruptor::new){{
+        eruptor = new UnitType("eruptor", Eruptor.class, Eruptor::new){{
             maxVelocity = 0.81f;
             speed = 0.16f;
             drag = 0.4f;
@@ -82,7 +82,7 @@ public class UnitTypes implements ContentList{
             immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting);
         }};
 
-        wraith = new UnitType("wraith", io.anuke.mindustry.entities.type.types.Wraith.class, io.anuke.mindustry.entities.type.types.Wraith::new){{
+        wraith = new UnitType("wraith", Wraith.class, Wraith::new){{
             speed = 0.3f;
             maxVelocity = 1.9f;
             drag = 0.01f;
@@ -92,7 +92,7 @@ public class UnitTypes implements ContentList{
             health = 70;
         }};
 
-        ghoul = new UnitType("ghoul", io.anuke.mindustry.entities.type.types.Ghoul.class, io.anuke.mindustry.entities.type.types.Ghoul::new){{
+        ghoul = new UnitType("ghoul", Ghoul.class, Ghoul::new){{
             health = 250;
             speed = 0.2f;
             maxVelocity = 1.4f;
@@ -103,7 +103,7 @@ public class UnitTypes implements ContentList{
             weapon = Weapons.bomber;
         }};
 
-        revenant = new UnitType("revenant", io.anuke.mindustry.entities.type.types.Revenant.class, io.anuke.mindustry.entities.type.types.Revenant::new){{
+        revenant = new UnitType("revenant", Revenant.class, Revenant::new){{
             health = 250;
             mass = 5f;
             hitsize = 12f;
@@ -115,7 +115,7 @@ public class UnitTypes implements ContentList{
             weapon = Weapons.laserBurster;
         }};
 
-        phantom = new UnitType("phantom", io.anuke.mindustry.entities.type.types.Phantom.class, io.anuke.mindustry.entities.type.types.Phantom::new){{
+        phantom = new UnitType("phantom", Phantom.class, Phantom::new){{
             weapon = Weapons.healBlasterDrone2;
             isFlying = true;
             drag = 0.01f;
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Crawler.java b/core/src/io/anuke/mindustry/entities/type/base/Crawler.java
similarity index 66%
rename from core/src/io/anuke/mindustry/entities/type/types/Crawler.java
rename to core/src/io/anuke/mindustry/entities/type/base/Crawler.java
index 6ff5d2167c..f3c12c9604 100644
--- a/core/src/io/anuke/mindustry/entities/type/types/Crawler.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Crawler.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type.types;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.mindustry.entities.type.GroundUnit;
 
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Dagger.java b/core/src/io/anuke/mindustry/entities/type/base/Dagger.java
similarity index 66%
rename from core/src/io/anuke/mindustry/entities/type/types/Dagger.java
rename to core/src/io/anuke/mindustry/entities/type/base/Dagger.java
index 4f3ed898fa..13bf6021c9 100644
--- a/core/src/io/anuke/mindustry/entities/type/types/Dagger.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Dagger.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type.types;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.mindustry.entities.type.GroundUnit;
 
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Drone.java b/core/src/io/anuke/mindustry/entities/type/base/Drone.java
similarity index 99%
rename from core/src/io/anuke/mindustry/entities/type/types/Drone.java
rename to core/src/io/anuke/mindustry/entities/type/base/Drone.java
index 845e05d8bb..74fbaa964c 100644
--- a/core/src/io/anuke/mindustry/entities/type/types/Drone.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Drone.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type.types;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.arc.Events;
 import io.anuke.arc.collection.Queue;
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Eruptor.java b/core/src/io/anuke/mindustry/entities/type/base/Eruptor.java
similarity index 66%
rename from core/src/io/anuke/mindustry/entities/type/types/Eruptor.java
rename to core/src/io/anuke/mindustry/entities/type/base/Eruptor.java
index 4a3104afc6..dfbfe9db39 100644
--- a/core/src/io/anuke/mindustry/entities/type/types/Eruptor.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Eruptor.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type.types;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.mindustry.entities.type.GroundUnit;
 
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Fortress.java b/core/src/io/anuke/mindustry/entities/type/base/Fortress.java
similarity index 89%
rename from core/src/io/anuke/mindustry/entities/type/types/Fortress.java
rename to core/src/io/anuke/mindustry/entities/type/base/Fortress.java
index 8811d43910..06033fcf66 100644
--- a/core/src/io/anuke/mindustry/entities/type/types/Fortress.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Fortress.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type.types;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.type.GroundUnit;
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Ghoul.java b/core/src/io/anuke/mindustry/entities/type/base/Ghoul.java
similarity index 66%
rename from core/src/io/anuke/mindustry/entities/type/types/Ghoul.java
rename to core/src/io/anuke/mindustry/entities/type/base/Ghoul.java
index 1bd26a6154..bc1f6a5317 100644
--- a/core/src/io/anuke/mindustry/entities/type/types/Ghoul.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Ghoul.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type.types;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.mindustry.entities.type.FlyingUnit;
 
diff --git a/core/src/io/anuke/mindustry/entities/type/base/Phantom.java b/core/src/io/anuke/mindustry/entities/type/base/Phantom.java
new file mode 100644
index 0000000000..516d305b94
--- /dev/null
+++ b/core/src/io/anuke/mindustry/entities/type/base/Phantom.java
@@ -0,0 +1,5 @@
+package io.anuke.mindustry.entities.type.base;
+
+public class Phantom extends Drone{
+
+}
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Revenant.java b/core/src/io/anuke/mindustry/entities/type/base/Revenant.java
similarity index 67%
rename from core/src/io/anuke/mindustry/entities/type/types/Revenant.java
rename to core/src/io/anuke/mindustry/entities/type/base/Revenant.java
index 1c30c1949a..5e3d959bce 100644
--- a/core/src/io/anuke/mindustry/entities/type/types/Revenant.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Revenant.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type.types;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.mindustry.entities.type.FlyingUnit;
 
diff --git a/core/src/io/anuke/mindustry/entities/type/base/Spirit.java b/core/src/io/anuke/mindustry/entities/type/base/Spirit.java
new file mode 100644
index 0000000000..f7142e8d6d
--- /dev/null
+++ b/core/src/io/anuke/mindustry/entities/type/base/Spirit.java
@@ -0,0 +1,4 @@
+package io.anuke.mindustry.entities.type.base;
+
+public class Spirit extends Drone{
+}
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Titan.java b/core/src/io/anuke/mindustry/entities/type/base/Titan.java
similarity index 66%
rename from core/src/io/anuke/mindustry/entities/type/types/Titan.java
rename to core/src/io/anuke/mindustry/entities/type/base/Titan.java
index b9e259d2fc..1ac30593ac 100644
--- a/core/src/io/anuke/mindustry/entities/type/types/Titan.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Titan.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type.types;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.mindustry.entities.type.GroundUnit;
 
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Wraith.java b/core/src/io/anuke/mindustry/entities/type/base/Wraith.java
similarity index 66%
rename from core/src/io/anuke/mindustry/entities/type/types/Wraith.java
rename to core/src/io/anuke/mindustry/entities/type/base/Wraith.java
index 0734008dd5..9123ffcb8d 100644
--- a/core/src/io/anuke/mindustry/entities/type/types/Wraith.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Wraith.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type.types;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.mindustry.entities.type.FlyingUnit;
 
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Phantom.java b/core/src/io/anuke/mindustry/entities/type/types/Phantom.java
deleted file mode 100644
index 469ba1bad0..0000000000
--- a/core/src/io/anuke/mindustry/entities/type/types/Phantom.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.anuke.mindustry.entities.type.types;
-
-public class Phantom extends Drone{
-
-}
diff --git a/core/src/io/anuke/mindustry/entities/type/types/Spirit.java b/core/src/io/anuke/mindustry/entities/type/types/Spirit.java
deleted file mode 100644
index e95ca3bd8b..0000000000
--- a/core/src/io/anuke/mindustry/entities/type/types/Spirit.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package io.anuke.mindustry.entities.type.types;
-
-public class Spirit extends Drone{
-}
diff --git a/core/src/io/anuke/mindustry/type/UnitType.java b/core/src/io/anuke/mindustry/type/UnitType.java
index d02174bf4c..213b430691 100644
--- a/core/src/io/anuke/mindustry/type/UnitType.java
+++ b/core/src/io/anuke/mindustry/type/UnitType.java
@@ -16,7 +16,7 @@ import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.ui.ContentDisplay;
 
 public class UnitType extends UnlockableContent{
-    protected final Supplier<? extends io.anuke.mindustry.entities.type.BaseUnit> constructor;
+    protected final Supplier<? extends BaseUnit> constructor;
 
     public final String name;
     public final String description;
@@ -42,7 +42,7 @@ public class UnitType extends UnlockableContent{
 
     public TextureRegion iconRegion, legRegion, baseRegion, region;
 
-    public <T extends io.anuke.mindustry.entities.type.BaseUnit> UnitType(String name, Class<T> type, Supplier<T> mainConstructor){
+    public <T extends BaseUnit> UnitType(String name, Class<T> type, Supplier<T> mainConstructor){
         this.name = name;
         this.constructor = mainConstructor;
         this.description = Core.bundle.getOrNull("unit." + name + ".description");
@@ -91,7 +91,7 @@ public class UnitType extends UnlockableContent{
         return name;
     }
 
-    public io.anuke.mindustry.entities.type.BaseUnit create(Team team){
+    public BaseUnit create(Team team){
         BaseUnit unit = constructor.get();
         unit.init(this, team);
         return unit;
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index 9a001f8a62..059a1b4519 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -14,7 +14,7 @@ import io.anuke.mindustry.core.NetServer;
 import io.anuke.mindustry.core.World;
 import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
 import io.anuke.mindustry.entities.type.BaseUnit;
-import io.anuke.mindustry.entities.type.types.Spirit;
+import io.anuke.mindustry.entities.type.base.Spirit;
 import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.io.BundleLoader;
@@ -231,8 +231,8 @@ public class ApplicationTests{
         d2.addBuildRequest(new BuildRequest(1, 1, 0, Blocks.copperWallLarge));
 
         Time.setDeltaProvider(() -> 9999999f);
-        d1.updateBuilding(d1);
-        d2.updateBuilding(d2);
+        d1.updateBuilding();
+        d2.updateBuilding();
 
         assertEquals(Blocks.copperWallLarge, world.tile(0, 0).block());
         assertEquals(Blocks.air, world.tile(2, 2).block());
@@ -253,16 +253,16 @@ public class ApplicationTests{
         d2.addBuildRequest(new BuildRequest(1, 1));
 
         Time.setDeltaProvider(() -> 3f);
-        d1.updateBuilding(d1);
+        d1.updateBuilding();
         Time.setDeltaProvider(() -> 1f);
-        d2.updateBuilding(d2);
+        d2.updateBuilding();
 
         assertEquals(content.getByName(ContentType.block, "build2"), world.tile(0, 0).block());
 
         Time.setDeltaProvider(() -> 9999f);
 
-        d1.updateBuilding(d1);
-        d2.updateBuilding(d2);
+        d1.updateBuilding();
+        d2.updateBuilding();
 
         assertEquals(Blocks.air, world.tile(0, 0).block());
         assertEquals(Blocks.air, world.tile(2, 2).block());