diff --git a/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntityEffectProvider.java b/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntityEffectProvider.java
index 96b12d61de3..16b4a680056 100644
--- a/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntityEffectProvider.java
+++ b/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntityEffectProvider.java
@@ -27,11 +27,10 @@
 import net.minecraft.potion.Effect;
 import net.minecraft.tileentity.BeaconTileEntity;
 import org.spongepowered.api.data.Key;
-import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.effect.potion.PotionEffectType;
 import org.spongepowered.common.data.provider.GenericMutableDataProvider;
-import org.spongepowered.common.mixin.accessor.block.tileentity.BeaconTileEntityAccessor;
+import org.spongepowered.common.mixin.accessor.tileentity.BeaconTileEntityAccessor;
 
 import java.util.Optional;
 import java.util.function.BiConsumer;
diff --git a/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntityPrimaryEffectProvider.java b/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntityPrimaryEffectProvider.java
index dbb76bad72f..eb5d0f7ca84 100644
--- a/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntityPrimaryEffectProvider.java
+++ b/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntityPrimaryEffectProvider.java
@@ -25,7 +25,7 @@
 package org.spongepowered.common.data.provider.block.entity;
 
 import org.spongepowered.api.data.Keys;
-import org.spongepowered.common.mixin.accessor.block.tileentity.BeaconTileEntityAccessor;
+import org.spongepowered.common.mixin.accessor.tileentity.BeaconTileEntityAccessor;
 
 public class BeaconTileEntityPrimaryEffectProvider extends BeaconTileEntityEffectProvider {
 
diff --git a/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntitySecondaryEffectProvider.java b/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntitySecondaryEffectProvider.java
index a06a52278c6..9172848d5d7 100644
--- a/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntitySecondaryEffectProvider.java
+++ b/src/main/java/org/spongepowered/common/data/provider/block/entity/BeaconTileEntitySecondaryEffectProvider.java
@@ -25,7 +25,7 @@
 package org.spongepowered.common.data.provider.block.entity;
 
 import org.spongepowered.api.data.Keys;
-import org.spongepowered.common.mixin.accessor.block.tileentity.BeaconTileEntityAccessor;
+import org.spongepowered.common.mixin.accessor.tileentity.BeaconTileEntityAccessor;
 
 public class BeaconTileEntitySecondaryEffectProvider extends BeaconTileEntityEffectProvider {
 
diff --git a/src/main/java/org/spongepowered/common/data/provider/entity/player/PlayerEntityFlyingSpeedProvider.java b/src/main/java/org/spongepowered/common/data/provider/entity/player/PlayerEntityFlyingSpeedProvider.java
index 8ba9d6a23bb..fe58ba39f1b 100644
--- a/src/main/java/org/spongepowered/common/data/provider/entity/player/PlayerEntityFlyingSpeedProvider.java
+++ b/src/main/java/org/spongepowered/common/data/provider/entity/player/PlayerEntityFlyingSpeedProvider.java
@@ -27,7 +27,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.common.data.provider.GenericMutableDataProvider;
-import org.spongepowered.common.mixin.accessor.entity.player.PlayerCapabilitiesAccessor;
+import org.spongepowered.common.mixin.accessor.entity.player.PlayerAbilitiesAccessor;
 
 import java.util.Optional;
 
@@ -44,7 +44,7 @@ protected Optional<Double> getFrom(PlayerEntity dataHolder) {
 
     @Override
     protected boolean set(PlayerEntity dataHolder, Double value) {
-        ((PlayerCapabilitiesAccessor) dataHolder.abilities).accessor$setFlySpeed(value.floatValue());
+        ((PlayerAbilitiesAccessor) dataHolder.abilities).accessor$setFlySpeed(value.floatValue());
         dataHolder.sendPlayerAbilities();
         return true;
     }
diff --git a/src/main/java/org/spongepowered/common/data/provider/entity/player/PlayerEntityWalkingSpeedProvider.java b/src/main/java/org/spongepowered/common/data/provider/entity/player/PlayerEntityWalkingSpeedProvider.java
index 31cf05be85c..a9beee1fdd7 100644
--- a/src/main/java/org/spongepowered/common/data/provider/entity/player/PlayerEntityWalkingSpeedProvider.java
+++ b/src/main/java/org/spongepowered/common/data/provider/entity/player/PlayerEntityWalkingSpeedProvider.java
@@ -29,7 +29,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.common.data.provider.GenericMutableDataProvider;
-import org.spongepowered.common.mixin.accessor.entity.player.PlayerCapabilitiesAccessor;
+import org.spongepowered.common.mixin.accessor.entity.player.PlayerAbilitiesAccessor;
 
 import java.util.Optional;
 
@@ -46,7 +46,7 @@ protected Optional<Double> getFrom(PlayerEntity dataHolder) {
 
     @Override
     protected boolean set(PlayerEntity dataHolder, Double value) {
-        ((PlayerCapabilitiesAccessor) dataHolder.abilities).accessor$setWalkSpeed(value.floatValue());
+        ((PlayerAbilitiesAccessor) dataHolder.abilities).accessor$setWalkSpeed(value.floatValue());
         final IAttributeInstance attribute = dataHolder.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED);
         attribute.setBaseValue(value);
         dataHolder.sendPlayerAbilities();
diff --git a/src/main/java/org/spongepowered/common/mixin/accessor/entity/player/PlayerCapabilitiesAccessor.java b/src/main/java/org/spongepowered/common/mixin/accessor/entity/player/PlayerAbilitiesAccessor.java
similarity index 97%
rename from src/main/java/org/spongepowered/common/mixin/accessor/entity/player/PlayerCapabilitiesAccessor.java
rename to src/main/java/org/spongepowered/common/mixin/accessor/entity/player/PlayerAbilitiesAccessor.java
index 70e971db6ef..c5a125b2a00 100644
--- a/src/main/java/org/spongepowered/common/mixin/accessor/entity/player/PlayerCapabilitiesAccessor.java
+++ b/src/main/java/org/spongepowered/common/mixin/accessor/entity/player/PlayerAbilitiesAccessor.java
@@ -29,7 +29,7 @@
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(PlayerAbilities.class)
-public interface PlayerCapabilitiesAccessor {
+public interface PlayerAbilitiesAccessor {
 
     @Accessor("flySpeed") void accessor$setFlySpeed(float flySpeed);
 
diff --git a/src/main/java/org/spongepowered/common/mixin/accessor/block/tileentity/BeaconTileEntityAccessor.java b/src/main/java/org/spongepowered/common/mixin/accessor/tileentity/BeaconTileEntityAccessor.java
similarity index 96%
rename from src/main/java/org/spongepowered/common/mixin/accessor/block/tileentity/BeaconTileEntityAccessor.java
rename to src/main/java/org/spongepowered/common/mixin/accessor/tileentity/BeaconTileEntityAccessor.java
index ff05068e3dd..0b01846b96e 100644
--- a/src/main/java/org/spongepowered/common/mixin/accessor/block/tileentity/BeaconTileEntityAccessor.java
+++ b/src/main/java/org/spongepowered/common/mixin/accessor/tileentity/BeaconTileEntityAccessor.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.common.mixin.accessor.block.tileentity;
+package org.spongepowered.common.mixin.accessor.tileentity;
 
 import net.minecraft.potion.Effect;
 import net.minecraft.tileentity.BeaconTileEntity;
diff --git a/src/main/java/org/spongepowered/common/mixin/accessor/raid/RaidAccessor.java b/src/main/java/org/spongepowered/common/mixin/accessor/world/raid/RaidAccessor.java
similarity index 96%
rename from src/main/java/org/spongepowered/common/mixin/accessor/raid/RaidAccessor.java
rename to src/main/java/org/spongepowered/common/mixin/accessor/world/raid/RaidAccessor.java
index b31e86d2500..71dff9fd04c 100644
--- a/src/main/java/org/spongepowered/common/mixin/accessor/raid/RaidAccessor.java
+++ b/src/main/java/org/spongepowered/common/mixin/accessor/world/raid/RaidAccessor.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.common.mixin.accessor.raid;
+package org.spongepowered.common.mixin.accessor.world.raid;
 
 import net.minecraft.world.raid.Raid;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/org/spongepowered/common/raid/SpongeWave.java b/src/main/java/org/spongepowered/common/raid/SpongeWave.java
index 18830d26fae..3391f116ebb 100644
--- a/src/main/java/org/spongepowered/common/raid/SpongeWave.java
+++ b/src/main/java/org/spongepowered/common/raid/SpongeWave.java
@@ -31,7 +31,7 @@
 import org.spongepowered.api.entity.living.monster.raider.Raider;
 import org.spongepowered.api.raid.Raid;
 import org.spongepowered.api.raid.Wave;
-import org.spongepowered.common.mixin.accessor.raid.RaidAccessor;
+import org.spongepowered.common.mixin.accessor.world.raid.RaidAccessor;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/src/main/resources/mixins.common.accessor.json b/src/main/resources/mixins.common.accessor.json
index 14575c1d056..8a5958df4f0 100644
--- a/src/main/resources/mixins.common.accessor.json
+++ b/src/main/resources/mixins.common.accessor.json
@@ -9,6 +9,7 @@
     "mixins": [
         "advancements.AdvancementManagerAccessor",
         "advancements.CriteriaTriggersAccessor",
+        "block.AbstractSkullBlockAccessor",
         "block.FireBlockAccessor",
         "block.RedstoneWireBlockAccessor",
         "entity.boss.dragon.phase.PhaseTypeAccessor",
@@ -17,6 +18,7 @@
         "entity.item.FallingBlockEntityAccessor",
         "entity.item.FireworkRocketEntityAccessor",
         "entity.item.HangingEntityAccessor",
+        "entity.monster.BlazeEntityAccessor",
         "entity.monster.CreeperEntityAccessor",
         "entity.monster.EndermanEntityAccessor",
         "entity.monster.EndermiteEntityAccessor",
@@ -28,7 +30,7 @@
         "entity.passive.PigEntityAccessor",
         "entity.passive.SheepEntityAccessor",
         "entity.passive.WolfEntityAccessor",
-        "entity.player.PlayerCapabilitiesAccessor",
+        "entity.player.PlayerAbilitiesAccessor",
         "entity.player.PlayerEntityAccessor",
         "entity.projectile.AbstractArrowEntityAccessor",
         "entity.projectile.ArrowEntityAccessor",
@@ -37,8 +39,11 @@
         "entity.AgeableEntityAccessor",
         "entity.AreaEffectCloudEntityAccessor",
         "entity.EntityAccessor",
+        "entity.EntityPredicateAccessor",
         "entity.LivingEntityAccessor",
         "entity.MobEntityAccessor",
+        "inventory.container.AbstractFurnaceContainerAccessor",
+        "inventory.container.BeaconContainerAccessor",
         "inventory.container.BrewingStandContainerAccessor",
         "inventory.container.CraftingResultSlotAccessor",
         "inventory.container.ContainerAccessor",
@@ -69,8 +74,9 @@
         "scoreboard.ScoreAccessor",
         "scoreboard.ScoreboardAccessor",
         "scoreboard.ScoreObjectiveAccessor",
-        "server.management.PlayerListAccessor",
         "server.MinecraftServerAccessor",
+        "tileentity.BannerPatternAccessor",
+        "tileentity.BeaconTileEntityAccessor",
         "tileentity.BrewingStandTileEntityAccessor",
         "tileentity.CommandBlockLogicAccessor",
         "tileentity.EndGatewayTileEntityAccessor",
@@ -78,8 +84,10 @@
         "tileentity.MobSpawnerTileEntityAccessor",
         "tileentity.SkullTileEntityAccessor",
         "util.math.AxisAlignedBBAccessor",
+        "util.registry.SimpleRegistryAccessor",
         "util.text.StringTextComponentAccessor",
         "util.text.StyleAccessor",
+        "util.text.TextFormattingAccessor",
         "util.CombatEntryAccessor",
         "util.CombatTrackerAccessor",
         "util.DamageSourceAccessor",
@@ -90,6 +98,7 @@
         "world.chunk.storage.RegionFileAccessor",
         "world.dimension.DimensionTypeAccessor",
         "world.gen.feature.DungeonsFeatureAccessor",
+        "world.raid.RaidAccessor",
         "world.server.ServerWorldAccessor",
         "world.spawner.AbstractSpawnerAccessor",
         "world.storage.SaveHandlerAccessor",
@@ -101,6 +110,7 @@
         ],
     "server": [
         "server.dedicated.DedicatedServerAccessor",
+        "server.management.PlayerListAccessor",
         "server.management.UserListAccessor",
         "server.management.UserListEntryAccessor"
     ]