diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java
index dee7d0887..61156127f 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java
@@ -10,8 +10,8 @@
 
 package ellpeck.actuallyadditions.blocks.render;
 
-import ellpeck.actuallyadditions.gadget.cloud.ISmileyCloudEasterEgg;
-import ellpeck.actuallyadditions.gadget.cloud.SmileyCloudEasterEggs;
+import ellpeck.actuallyadditions.misc.cloud.ISmileyCloudEasterEgg;
+import ellpeck.actuallyadditions.misc.cloud.SmileyCloudEasterEggs;
 import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud;
 import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/ellpeck/actuallyadditions/event/RenderPlayerEventAA.java b/src/main/java/ellpeck/actuallyadditions/event/RenderPlayerEventAA.java
index 161fb18c0..09d15516a 100644
--- a/src/main/java/ellpeck/actuallyadditions/event/RenderPlayerEventAA.java
+++ b/src/main/java/ellpeck/actuallyadditions/event/RenderPlayerEventAA.java
@@ -13,8 +13,8 @@ package ellpeck.actuallyadditions.event;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import ellpeck.actuallyadditions.blocks.InitBlocks;
-import ellpeck.actuallyadditions.gadget.RenderSpecial;
 import ellpeck.actuallyadditions.items.InitItems;
+import ellpeck.actuallyadditions.misc.RenderSpecial;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.event.RenderPlayerEvent;
diff --git a/src/main/java/ellpeck/actuallyadditions/gadget/ModelStandardBlock.java b/src/main/java/ellpeck/actuallyadditions/gadget/ModelStandardBlock.java
deleted file mode 100644
index ee727ad72..000000000
--- a/src/main/java/ellpeck/actuallyadditions/gadget/ModelStandardBlock.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This file ("ModelStandardBlock.java") is part of the Actually Additions Mod for Minecraft.
- * It is created and owned by Ellpeck and distributed
- * under the Actually Additions License to be found at
- * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md
- * View the source code at https://github.com/Ellpeck/ActuallyAdditions
- *
- * © 2015 Ellpeck
- */
-
-package ellpeck.actuallyadditions.gadget;
-
-import ellpeck.actuallyadditions.blocks.render.ModelBaseAA;
-import net.minecraft.client.model.ModelRenderer;
-
-public class ModelStandardBlock extends ModelBaseAA{
-
-    public ModelRenderer s;
-    private String name;
-
-    public ModelStandardBlock(String name){
-        this.name = name;
-        this.textureWidth = 64;
-        this.textureHeight = 64;
-        this.s = new ModelRenderer(this, 0, 0);
-        this.s.setRotationPoint(-8.0F, 8.0F, -8.0F);
-        this.s.addBox(0.0F, 0.0F, 0.0F, 16, 16, 16, 0.0F);
-    }
-
-    @Override
-    public void render(float f){
-        this.s.render(f);
-    }
-
-    @Override
-    public String getName(){
-        return "model"+this.name;
-    }
-}
diff --git a/src/main/java/ellpeck/actuallyadditions/gadget/ModelTorch.java b/src/main/java/ellpeck/actuallyadditions/gadget/ModelTorch.java
deleted file mode 100644
index 9ad6d61c6..000000000
--- a/src/main/java/ellpeck/actuallyadditions/gadget/ModelTorch.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file ("ModelTorch.java") is part of the Actually Additions Mod for Minecraft.
- * It is created and owned by Ellpeck and distributed
- * under the Actually Additions License to be found at
- * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md
- * View the source code at https://github.com/Ellpeck/ActuallyAdditions
- *
- * © 2015 Ellpeck
- */
-
-package ellpeck.actuallyadditions.gadget;
-
-import ellpeck.actuallyadditions.blocks.render.ModelBaseAA;
-import net.minecraft.client.model.ModelRenderer;
-
-public class ModelTorch extends ModelBaseAA{
-
-    public ModelRenderer s;
-
-    public ModelTorch(){
-        this.textureWidth = 64;
-        this.textureHeight = 32;
-        this.s = new ModelRenderer(this, 0, 0);
-        this.s.setRotationPoint(-1.0F, 14.0F, -1.0F);
-        this.s.addBox(0.0F, 0.0F, 0.0F, 2, 10, 2, 0.0F);
-    }
-
-    @Override
-    public void render(float f){
-        this.s.render(f);
-    }
-
-    @Override
-    public String getName(){
-        return "modelHose";
-    }
-}
diff --git a/src/main/java/ellpeck/actuallyadditions/gadget/RenderSpecial.java b/src/main/java/ellpeck/actuallyadditions/misc/RenderSpecial.java
similarity index 98%
rename from src/main/java/ellpeck/actuallyadditions/gadget/RenderSpecial.java
rename to src/main/java/ellpeck/actuallyadditions/misc/RenderSpecial.java
index 20ae1068b..1b24e9896 100644
--- a/src/main/java/ellpeck/actuallyadditions/gadget/RenderSpecial.java
+++ b/src/main/java/ellpeck/actuallyadditions/misc/RenderSpecial.java
@@ -8,7 +8,7 @@
  * © 2015 Ellpeck
  */
 
-package ellpeck.actuallyadditions.gadget;
+package ellpeck.actuallyadditions.misc;
 
 import ellpeck.actuallyadditions.event.RenderPlayerEventAA;
 import ellpeck.actuallyadditions.util.AssetUtil;
diff --git a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/ISmileyCloudEasterEgg.java b/src/main/java/ellpeck/actuallyadditions/misc/cloud/ISmileyCloudEasterEgg.java
similarity index 92%
rename from src/main/java/ellpeck/actuallyadditions/gadget/cloud/ISmileyCloudEasterEgg.java
rename to src/main/java/ellpeck/actuallyadditions/misc/cloud/ISmileyCloudEasterEgg.java
index 25291b491..d67538782 100644
--- a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/ISmileyCloudEasterEgg.java
+++ b/src/main/java/ellpeck/actuallyadditions/misc/cloud/ISmileyCloudEasterEgg.java
@@ -8,7 +8,7 @@
  * © 2015 Ellpeck
  */
 
-package ellpeck.actuallyadditions.gadget.cloud;
+package ellpeck.actuallyadditions.misc.cloud;
 
 public interface ISmileyCloudEasterEgg{
 
diff --git a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java b/src/main/java/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java
similarity index 99%
rename from src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java
rename to src/main/java/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java
index e9bbd2645..93adb8e4b 100644
--- a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java
+++ b/src/main/java/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java
@@ -8,7 +8,7 @@
  * © 2015 Ellpeck
  */
 
-package ellpeck.actuallyadditions.gadget.cloud;
+package ellpeck.actuallyadditions.misc.cloud;
 
 import ellpeck.actuallyadditions.blocks.InitBlocks;
 import ellpeck.actuallyadditions.items.InitItems;