diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java
index 76ce8e44e..dc7f15eeb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/ActuallyAdditions.java
@@ -22,7 +22,7 @@ public class ActuallyAdditions {
     public static final ItemGroup ACTUALLY_GROUP = new ItemGroup(MOD_ID) {
         @Override
         public ItemStack createIcon() {
-            return new ItemStack(ActuallyBlocks.blockEmpowerer.get());
+            return new ItemStack(ActuallyItems.BOOKLET.get());
         }
     };
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java
index 99a7dbc44..6aebb7afb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java
@@ -1,6 +1,14 @@
 package de.ellpeck.actuallyadditions.common.blocks;
 
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.common.blocks.building.CrystalBlock;
+import de.ellpeck.actuallyadditions.common.blocks.building.CrystalClusterBlock;
+import de.ellpeck.actuallyadditions.common.blocks.building.FenceBlock;
+import de.ellpeck.actuallyadditions.common.blocks.building.WallBlock;
+import de.ellpeck.actuallyadditions.common.blocks.functional.*;
+import de.ellpeck.actuallyadditions.common.blocks.misc.TinyTorchBlock;
+import de.ellpeck.actuallyadditions.common.blocks.plant.BlackLotusBlock;
+import de.ellpeck.actuallyadditions.common.blocks.plant.PlantBlock;
 import de.ellpeck.actuallyadditions.common.blocks.types.Crystals;
 import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays;
 import de.ellpeck.actuallyadditions.common.blocks.types.PhantomType;
@@ -117,15 +125,15 @@ public class ActuallyBlocks {
     public static final RegistryObject<Block> WHITE_STAIRS = BLOCKS.register("white_stairs_block", () -> new StairsBlock(() -> WHITE_WALL.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
     public static final RegistryObject<Block> GREEN_SLAB = BLOCKS.register("green_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK)));
     public static final RegistryObject<Block> WHITE_SLAB = BLOCKS.register("white_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK)));
-    public static final RegistryObject<Block> GREEN_FENCE = BLOCKS.register("green_fence_block", () -> new FenceBlock(Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> GREEN_FENCE = BLOCKS.register("green_fence_block", () -> new de.ellpeck.actuallyadditions.common.blocks.building.FenceBlock(Block.Properties.create(Material.ROCK)));
     public static final RegistryObject<Block> WHITE_FENCE = BLOCKS.register("white_fence_block", () -> new FenceBlock(Block.Properties.create(Material.ROCK)));
 
     public static final RegistryObject<Block> BLACK_QUARTZ = BLOCKS.register("black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK)));
     public static final RegistryObject<Block> BLACK_QUARTZ_CHISELED = BLOCKS.register("black_quartz_chiseled_block", () -> new Block(Block.Properties.create(Material.ROCK)));
     public static final RegistryObject<Block> BLACK_QUARTZ_PILLAR = BLOCKS.register("black_quartz_pillar_block", () -> new Block(Block.Properties.create(Material.ROCK)));
 
-    public static final RegistryObject<Block> BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get())));
-    public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_chiseled_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get())));
+    public static final RegistryObject<Block> BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new de.ellpeck.actuallyadditions.common.blocks.building.WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get())));
+    public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_chiseled_quartz_wall_block", () -> new de.ellpeck.actuallyadditions.common.blocks.building.WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get())));
     public static final RegistryObject<Block> BLACK_PILLAR_QUARTZ_WALL = BLOCKS.register("black_pillar_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_PILLAR.get())));
     public static final RegistryObject<Block> BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
     public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_STAIR = BLOCKS.register("black_chiseled_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalBlock.java
similarity index 61%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalBlock.java
index 7034163c6..597c5be6f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.building;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class CrystalBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalClusterBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java
similarity index 68%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalClusterBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java
index 2955ce6f7..fe55cf6c5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CrystalClusterBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.building;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import de.ellpeck.actuallyadditions.common.blocks.types.Crystals;
 import net.minecraft.block.material.Material;
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FenceBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/FenceBlock.java
similarity index 81%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/FenceBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/FenceBlock.java
index f3e82a43e..0c0eeccaa 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FenceBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/FenceBlock.java
@@ -1,6 +1,7 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.building;
 
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/WallBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/WallBlock.java
similarity index 81%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/WallBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/WallBlock.java
index e76d1006f..280cf10f2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/WallBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/WallBlock.java
@@ -1,6 +1,7 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.building;
 
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/AtomicReconstructorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/AtomicReconstructorBlock.java
similarity index 61%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/AtomicReconstructorBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/AtomicReconstructorBlock.java
index ad1be5fab..3ef18e2cf 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/AtomicReconstructorBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/AtomicReconstructorBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class AtomicReconstructorBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BatteryBoxBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BatteryBoxBlock.java
similarity index 59%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/BatteryBoxBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BatteryBoxBlock.java
index eaba489e8..472d9d1bc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BatteryBoxBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BatteryBoxBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class BatteryBoxBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BioReactorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BioReactorBlock.java
similarity index 59%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/BioReactorBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BioReactorBlock.java
index d125273bf..9b7c3c40d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BioReactorBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BioReactorBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class BioReactorBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BreakerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BreakerBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/BreakerBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BreakerBlock.java
index 70438e40c..e4ef46f76 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BreakerBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/BreakerBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class BreakerBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CanolaPressBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CanolaPressBlock.java
similarity index 59%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/CanolaPressBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CanolaPressBlock.java
index 7d7751d60..00ea63d34 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CanolaPressBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CanolaPressBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class CanolaPressBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoalGeneratorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoalGeneratorBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoalGeneratorBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoalGeneratorBlock.java
index 0c28afcfd..e92fe4f1a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoalGeneratorBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoalGeneratorBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class CoalGeneratorBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoffeeMachineBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoffeeMachineBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoffeeMachineBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoffeeMachineBlock.java
index 767cd4f0e..a56a5223c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/CoffeeMachineBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/CoffeeMachineBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class CoffeeMachineBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ColoredLampBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ColoredLampBlock.java
similarity index 92%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/ColoredLampBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ColoredLampBlock.java
index 1ad1d1b4f..c13194941 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ColoredLampBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ColoredLampBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.material.Material;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DirectionalBreakerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DirectionalBreakerBlock.java
similarity index 61%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/DirectionalBreakerBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DirectionalBreakerBlock.java
index a45e9fc89..36ebcdc1d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DirectionalBreakerBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DirectionalBreakerBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class DirectionalBreakerBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DisplayStandBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DisplayStandBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/DisplayStandBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DisplayStandBlock.java
index 589c5fbd8..969b8000e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/DisplayStandBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/DisplayStandBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class DisplayStandBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EmpowererBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EmpowererBlock.java
similarity index 59%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/EmpowererBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EmpowererBlock.java
index 8a9de83a6..3d14cf84a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EmpowererBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EmpowererBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class EmpowererBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EnergizerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EnergizerBlock.java
similarity index 61%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/EnergizerBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EnergizerBlock.java
index e8a8c2e52..d8309fb89 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/EnergizerBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/EnergizerBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class EnergizerBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FarmerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FarmerBlock.java
similarity index 58%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/FarmerBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FarmerBlock.java
index 958b8e974..d7fae94c0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FarmerBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FarmerBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class FarmerBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FeederBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FeederBlock.java
similarity index 58%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/FeederBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FeederBlock.java
index c4928c98e..01ad0dd16 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FeederBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FeederBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class FeederBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FermentingBarrelBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FermentingBarrelBlock.java
similarity index 61%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/FermentingBarrelBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FermentingBarrelBlock.java
index e8add52a1..e3edff34c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FermentingBarrelBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FermentingBarrelBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class FermentingBarrelBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FireworkBoxBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FireworkBoxBlock.java
similarity index 59%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/FireworkBoxBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FireworkBoxBlock.java
index d236570bf..4005b6940 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FireworkBoxBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FireworkBoxBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class FireworkBoxBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FishingNetBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FishingNetBlock.java
similarity index 59%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/FishingNetBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FishingNetBlock.java
index 9ebe39840..e40a0b091 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FishingNetBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FishingNetBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class FishingNetBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FluidCollectorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FluidCollectorBlock.java
similarity index 62%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/FluidCollectorBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FluidCollectorBlock.java
index a8c250199..75935abfd 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FluidCollectorBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FluidCollectorBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class FluidCollectorBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceDoubleBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceDoubleBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceDoubleBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceDoubleBlock.java
index d0eb50bd4..582b13262 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceDoubleBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceDoubleBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class FurnaceDoubleBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceSolarBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSolarBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceSolarBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSolarBlock.java
index e4eace35a..933250916 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/FurnaceSolarBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSolarBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class FurnaceSolarBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GreenhouseGlassBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GreenhouseGlassBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/GreenhouseGlassBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GreenhouseGlassBlock.java
index 7bc7d5d9f..d1dd1db8b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GreenhouseGlassBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GreenhouseGlassBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class GreenhouseGlassBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GrinderBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GrinderBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/GrinderBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GrinderBlock.java
index b25fe5521..40b0aa2af 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/GrinderBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/GrinderBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class GrinderBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/HeatCollectorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/HeatCollectorBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/HeatCollectorBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/HeatCollectorBlock.java
index 2020844ac..392c6ea60 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/HeatCollectorBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/HeatCollectorBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class HeatCollectorBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InputterBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/InputterBlock.java
similarity index 61%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/InputterBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/InputterBlock.java
index 72b9b6310..39d798737 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/InputterBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/InputterBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class InputterBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemRepairerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemRepairerBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemRepairerBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemRepairerBlock.java
index bacd05a9c..6eac1a4d3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemRepairerBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemRepairerBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class ItemRepairerBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerBlock.java
similarity index 59%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerBlock.java
index b9b67e9ea..1aeab0376 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class ItemViewerBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerHoppingBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerHoppingBlock.java
similarity index 61%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerHoppingBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerHoppingBlock.java
index 56b6f644f..2ea65fc51 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ItemViewerHoppingBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemViewerHoppingBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class ItemViewerHoppingBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LampPowererBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java
similarity index 59%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/LampPowererBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java
index ff130a02a..8d4146ed8 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LampPowererBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class LampPowererBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LaserRelayBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LaserRelayBlock.java
similarity index 68%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/LaserRelayBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LaserRelayBlock.java
index 2cb89f4ab..9d8254ef1 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LaserRelayBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LaserRelayBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import de.ellpeck.actuallyadditions.common.blocks.types.LaserRelays;
 import net.minecraft.block.material.Material;
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LavaFactoryControllerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LavaFactoryControllerBlock.java
similarity index 62%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/LavaFactoryControllerBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LavaFactoryControllerBlock.java
index 51d76016a..f9dc51aa9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LavaFactoryControllerBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LavaFactoryControllerBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class LavaFactoryControllerBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LeafGeneratorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LeafGeneratorBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/LeafGeneratorBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LeafGeneratorBlock.java
index 219a28fbb..345fff034 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/LeafGeneratorBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LeafGeneratorBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class LeafGeneratorBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/MinerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/MinerBlock.java
similarity index 58%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/MinerBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/MinerBlock.java
index 1aa2acfcf..73ef75366 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/MinerBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/MinerBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class MinerBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/OilGeneratorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/OilGeneratorBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/OilGeneratorBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/OilGeneratorBlock.java
index 8a358702e..8199039db 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/OilGeneratorBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/OilGeneratorBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class OilGeneratorBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBlock.java
similarity index 67%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBlock.java
index 96d5064ae..b66abd917 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import de.ellpeck.actuallyadditions.common.blocks.types.PhantomType;
 import net.minecraft.block.material.Material;
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBoosterBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBoosterBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBoosterBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBoosterBlock.java
index 9c4a9de81..df939ce22 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PhantomBoosterBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PhantomBoosterBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class PhantomBoosterBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlayerInterfaceBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PlayerInterfaceBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlayerInterfaceBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PlayerInterfaceBlock.java
index 82a7381ac..9384b8f1b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlayerInterfaceBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/PlayerInterfaceBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class PlayerInterfaceBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/RangedCollectorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/RangedCollectorBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/RangedCollectorBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/RangedCollectorBlock.java
index 8313ba0e4..7cf95e29b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/RangedCollectorBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/RangedCollectorBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class RangedCollectorBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ShockSuppressorBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ShockSuppressorBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/ShockSuppressorBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ShockSuppressorBlock.java
index 98f212846..547484d13 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ShockSuppressorBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ShockSuppressorBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class ShockSuppressorBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/SmileyCloudBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/SmileyCloudBlock.java
similarity index 59%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/SmileyCloudBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/SmileyCloudBlock.java
index 4cde479a5..49e08cfd0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/SmileyCloudBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/SmileyCloudBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class SmileyCloudBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TreasureChestBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/TreasureChestBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/TreasureChestBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/TreasureChestBlock.java
index 93f8ffa78..ca8778561 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TreasureChestBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/TreasureChestBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class TreasureChestBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/XPSolidifierBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/XPSolidifierBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/XPSolidifierBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/XPSolidifierBlock.java
index 173187bf5..c6533b691 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/XPSolidifierBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/XPSolidifierBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.functional;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class XPSolidifierBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/misc/TinyTorchBlock.java
similarity index 86%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/misc/TinyTorchBlock.java
index 87080bab2..a360db1ed 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/misc/TinyTorchBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.misc;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlackLotusBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/BlackLotusBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlackLotusBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/BlackLotusBlock.java
index af3ce31a5..c26b1b24b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlackLotusBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/BlackLotusBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.plant;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class BlackLotusBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlantBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/PlantBlock.java
similarity index 83%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlantBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/PlantBlock.java
index acabce648..7f0405bc4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/PlantBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/PlantBlock.java
@@ -1,12 +1,13 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.plant;
 
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock;
 import net.minecraft.block.CropsBlock;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 
-public class PlantBlock extends CropsBlock implements IActuallyBlock  {
+public class PlantBlock extends CropsBlock implements IActuallyBlock {
     public PlantBlock(int minDropAmount, int maxDropAmount) {
         super(Properties.create(Material.ROCK));
     }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/WildPlantBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/WildPlantBlock.java
similarity index 60%
rename from src/main/java/de/ellpeck/actuallyadditions/common/blocks/WildPlantBlock.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/WildPlantBlock.java
index 883ce3697..d484ebba2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/WildPlantBlock.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/plant/WildPlantBlock.java
@@ -1,5 +1,6 @@
-package de.ellpeck.actuallyadditions.common.blocks;
+package de.ellpeck.actuallyadditions.common.blocks.plant;
 
+import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock;
 import net.minecraft.block.material.Material;
 
 public class WildPlantBlock extends ActuallyBlock {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java
index 590afa825..669404c04 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java
@@ -38,6 +38,8 @@ public class ActuallyItems {
     public static final RegistryObject<Item> EMERADIC_CRYSTAL = ITEMS.register("emeradic_crystal", basicItem());
     public static final RegistryObject<Item> ENORI_CRYSTAL = ITEMS.register("enori_crystal", basicItem());
 
+    public static final RegistryObject<Item> BOOKLET = ITEMS.register("booklet", basicItem());
+
     public static final Set<RegistryObject<Item>> SIMPLE_ITEMS = ImmutableSet.of(
             BLACK_QUARTS, RESTONIA_CRYSTAL, PALIS_CRYSTAL, DIAMATINE_CRYSTAL,
             VOID_CRYSTAL, EMERADIC_CRYSTAL, ENORI_CRYSTAL
diff --git a/src/main/resources/assets/actuallyadditions/textures/item/item_booklet.png b/src/main/resources/assets/actuallyadditions/textures/item/booklet.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/item/item_booklet.png
rename to src/main/resources/assets/actuallyadditions/textures/item/booklet.png