diff --git a/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java b/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java
index ca241911..4641c6d4 100644
--- a/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java
+++ b/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java
@@ -2,6 +2,8 @@ package com.minelittlepony.client.render.entities;
 
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.PonyRenderManager;
+import com.minelittlepony.client.render.entities.villager.RenderPonyVillager;
+import com.minelittlepony.client.render.entities.villager.RenderPonyZombieVillager;
 import com.minelittlepony.common.util.settings.Setting;
 
 import java.util.Arrays;
diff --git a/src/main/java/com/minelittlepony/client/render/entities/villager/AbstractVillagerRenderer.java b/src/main/java/com/minelittlepony/client/render/entities/villager/AbstractVillagerRenderer.java
index f4b460e8..984ea3ec 100644
--- a/src/main/java/com/minelittlepony/client/render/entities/villager/AbstractVillagerRenderer.java
+++ b/src/main/java/com/minelittlepony/client/render/entities/villager/AbstractVillagerRenderer.java
@@ -15,7 +15,7 @@ import com.minelittlepony.model.IUnicorn;
 import com.minelittlepony.model.gear.IGear;
 import com.minelittlepony.util.resources.ITextureSupplier;
 
-public abstract class AbstractVillagerRenderer<
+abstract class AbstractVillagerRenderer<
     T extends MobEntity & VillagerDataContainer,
     M extends ClientPonyModel<T> & IUnicorn<PonyRenderer> & ModelWithHat> extends RenderPonyMob.Caster<T, M> {
 
diff --git a/src/main/java/com/minelittlepony/client/render/entities/villager/ClothingLayer.java b/src/main/java/com/minelittlepony/client/render/entities/villager/ClothingLayer.java
index 9fa741e5..0df56822 100644
--- a/src/main/java/com/minelittlepony/client/render/entities/villager/ClothingLayer.java
+++ b/src/main/java/com/minelittlepony/client/render/entities/villager/ClothingLayer.java
@@ -18,7 +18,7 @@ import com.minelittlepony.client.model.IPonyModel;
 import com.minelittlepony.client.render.IPonyRender;
 import com.minelittlepony.client.render.RenderPony;
 
-public class ClothingLayer<
+class ClothingLayer<
     T extends LivingEntity & VillagerDataContainer,
     M extends EntityModel<T> & IPonyModel<T> & ModelWithHat,
     C extends FeatureRendererContext<T, M> & IPonyRender<T, M>> extends VillagerClothingFeatureRenderer<T, M> {
diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java b/src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyVillager.java
similarity index 88%
rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java
rename to src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyVillager.java
index c308218e..77d8b2f7 100644
--- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java
+++ b/src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyVillager.java
@@ -1,7 +1,6 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entities.villager;
 
 import com.minelittlepony.client.model.entities.ModelVillagerPony;
-import com.minelittlepony.client.render.entities.villager.AbstractVillagerRenderer;
 import com.minelittlepony.util.resources.ITextureSupplier;
 import com.mojang.blaze3d.platform.GlStateManager;
 
diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java b/src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyZombieVillager.java
similarity index 89%
rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java
rename to src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyZombieVillager.java
index cc907e91..c7be8579 100644
--- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java
+++ b/src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyZombieVillager.java
@@ -1,7 +1,6 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entities.villager;
 
 import com.minelittlepony.client.model.entities.ModelZombieVillagerPony;
-import com.minelittlepony.client.render.entities.villager.AbstractVillagerRenderer;
 import com.minelittlepony.util.resources.ITextureSupplier;
 
 import net.fabricmc.fabric.api.client.render.EntityRendererRegistry;