diff --git a/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java b/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java
index 1698207..9391906 100644
--- a/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java
+++ b/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java
@@ -7,8 +7,12 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 
+import com.google.gson.annotations.Expose;
+
 import world.bentobox.bentobox.database.objects.DataObject;
 import world.bentobox.bentobox.database.objects.adapters.Adapter;
+import world.bentobox.greenhouses.data.adapters.BiomeRecipeAdapter;
+import world.bentobox.greenhouses.data.adapters.RectangleAdapter;
 import world.bentobox.greenhouses.greenhouse.BiomeRecipe;
 import world.bentobox.greenhouses.greenhouse.Walls;
 
@@ -30,15 +34,23 @@ public class Greenhouse implements DataObject {
                 + ", broken=" + broken + "]";
     }
 
+    @Expose
     private String uniqueId = UUID.randomUUID().toString();
+    @Expose
     private Location location;
-    @Adapter(RectangleSerializer.class)
+    @Expose
+    @Adapter(RectangleAdapter.class)
     private Rectangle footprint;
+    @Expose
     private int ceilingHeight;
+    @Expose
     private Biome originalBiome;
+    @Expose
     private Location roofHopperLocation;
-    @Adapter(BiomeRecipeSerializer.class)
+    @Expose
+    @Adapter(BiomeRecipeAdapter.class)
     private BiomeRecipe biomeRecipe;
+
     private boolean broken;
 
     /**
diff --git a/src/main/java/world/bentobox/greenhouses/data/BiomeRecipeSerializer.java b/src/main/java/world/bentobox/greenhouses/data/adapters/BiomeRecipeAdapter.java
similarity index 78%
rename from src/main/java/world/bentobox/greenhouses/data/BiomeRecipeSerializer.java
rename to src/main/java/world/bentobox/greenhouses/data/adapters/BiomeRecipeAdapter.java
index 8c781b4..78a8aba 100644
--- a/src/main/java/world/bentobox/greenhouses/data/BiomeRecipeSerializer.java
+++ b/src/main/java/world/bentobox/greenhouses/data/adapters/BiomeRecipeAdapter.java
@@ -1,4 +1,4 @@
-package world.bentobox.greenhouses.data;
+package world.bentobox.greenhouses.data.adapters;
 
 import world.bentobox.bentobox.database.objects.adapters.AdapterInterface;
 import world.bentobox.greenhouses.greenhouse.BiomeRecipe;
@@ -8,7 +8,7 @@ import world.bentobox.greenhouses.managers.RecipeManager;
  * @author tastybento
  *
  */
-public class BiomeRecipeSerializer implements AdapterInterface<BiomeRecipe, String> {
+public class BiomeRecipeAdapter implements AdapterInterface<BiomeRecipe, String> {
 
     @Override
     public BiomeRecipe deserialize(Object object) {
diff --git a/src/main/java/world/bentobox/greenhouses/data/RectangleSerializer.java b/src/main/java/world/bentobox/greenhouses/data/adapters/RectangleAdapter.java
similarity index 84%
rename from src/main/java/world/bentobox/greenhouses/data/RectangleSerializer.java
rename to src/main/java/world/bentobox/greenhouses/data/adapters/RectangleAdapter.java
index fd60f0a..7fa42c3 100644
--- a/src/main/java/world/bentobox/greenhouses/data/RectangleSerializer.java
+++ b/src/main/java/world/bentobox/greenhouses/data/adapters/RectangleAdapter.java
@@ -1,4 +1,4 @@
-package world.bentobox.greenhouses.data;
+package world.bentobox.greenhouses.data.adapters;
 
 import java.awt.Rectangle;
 
@@ -8,7 +8,7 @@ import world.bentobox.bentobox.database.objects.adapters.AdapterInterface;
  * @author tastybento
  *
  */
-public class RectangleSerializer implements AdapterInterface<Rectangle, String> {
+public class RectangleAdapter implements AdapterInterface<Rectangle, String> {
 
     @Override
     public Rectangle deserialize(Object object) {