(Breaking) Moved some packages around.

Most of the changes should not break *most* WorldEdit-using plugins,
but implementations of WorldEdit are broken by this change.

src/forge/java/com/sk89q/worldedit/forge/ForgePlayer.java

@@ -10,8 +10,8 @@ import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldVector;
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
-import com.sk89q.worldedit.cui.CUIEvent;
+import com.sk89q.worldedit.internal.cui.CUIEvent;
 
 public class ForgePlayer extends LocalPlayer {
     private EntityPlayerMP player;

src/main/java/com/sk89q/jnbt/NBTUtils.java

@@ -2,20 +2,7 @@ package com.sk89q.jnbt;
 
 import java.util.Map;
 
-import com.sk89q.jnbt.ByteArrayTag;
+import com.sk89q.worldedit.world.storage.InvalidFormatException;
-import com.sk89q.jnbt.ByteTag;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.DoubleTag;
-import com.sk89q.jnbt.EndTag;
-import com.sk89q.jnbt.FloatTag;
-import com.sk89q.jnbt.IntTag;
-import com.sk89q.jnbt.ListTag;
-import com.sk89q.jnbt.LongTag;
-import com.sk89q.jnbt.NBTConstants;
-import com.sk89q.jnbt.ShortTag;
-import com.sk89q.jnbt.StringTag;
-import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.data.InvalidFormatException;
 
 /*
  * JNBT License

src/main/java/com/sk89q/worldedit/CuboidClipboard.java

@@ -30,9 +30,10 @@ import java.util.Map;
 
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.schematic.SchematicFormat;
+import com.sk89q.worldedit.util.Countable;
 
 /**
  * The clipboard remembers the state of a cuboid region.

src/main/java/com/sk89q/worldedit/EditSession.java

@@ -19,16 +19,24 @@
 
 package com.sk89q.worldedit;
 
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.buffer.ForgetfulExtentBuffer;
+import com.sk89q.worldedit.extent.cache.LastAccessExtentCache;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
-import com.sk89q.worldedit.expression.Expression;
+import com.sk89q.worldedit.internal.expression.Expression;
-import com.sk89q.worldedit.expression.ExpressionException;
+import com.sk89q.worldedit.internal.expression.ExpressionException;
-import com.sk89q.worldedit.expression.runtime.RValue;
+import com.sk89q.worldedit.internal.expression.runtime.RValue;
 import com.sk89q.worldedit.extent.*;
+import com.sk89q.worldedit.extent.inventory.BlockBagExtent;
 import com.sk89q.worldedit.extent.reorder.MultiStageReorder;
+import com.sk89q.worldedit.extent.validation.BlockChangeLimiter;
+import com.sk89q.worldedit.extent.validation.DataValidatorExtent;
+import com.sk89q.worldedit.extent.world.BlockQuirkExtent;
+import com.sk89q.worldedit.extent.world.ChunkLoadingExtent;
+import com.sk89q.worldedit.extent.world.FastModeExtent;
 import com.sk89q.worldedit.function.GroundFunction;
 import com.sk89q.worldedit.function.RegionMaskingFilter;
 import com.sk89q.worldedit.function.block.Counter;
@@ -54,10 +62,11 @@ import com.sk89q.worldedit.math.transform.AffineTransform;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.patterns.SingleBlockPattern;
 import com.sk89q.worldedit.regions.*;
-import com.sk89q.worldedit.shape.ArbitraryBiomeShape;
+import com.sk89q.worldedit.regions.shape.ArbitraryBiomeShape;
-import com.sk89q.worldedit.shape.ArbitraryShape;
+import com.sk89q.worldedit.regions.shape.ArbitraryShape;
-import com.sk89q.worldedit.shape.RegionShape;
+import com.sk89q.worldedit.regions.shape.RegionShape;
-import com.sk89q.worldedit.shape.WorldEditExpressionEnvironment;
+import com.sk89q.worldedit.regions.shape.WorldEditExpressionEnvironment;
+import com.sk89q.worldedit.util.Countable;
 import com.sk89q.worldedit.util.TreeGenerator;
 import com.sk89q.worldedit.util.collection.DoubleArrayList;
 import com.sk89q.worldedit.util.eventbus.EventBus;

src/main/java/com/sk89q/worldedit/EditSessionFactory.java

@@ -19,7 +19,7 @@
 
 package com.sk89q.worldedit;
 
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
 import com.sk89q.worldedit.util.eventbus.EventBus;
 

src/main/java/com/sk89q/worldedit/LocalConfiguration.java

@@ -25,7 +25,7 @@ import java.util.Set;
 
 import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.blocks.ItemID;
-import com.sk89q.worldedit.snapshots.SnapshotRepository;
+import com.sk89q.worldedit.world.snapshot.SnapshotRepository;
 
 /**
  * Represents WorldEdit's configuration.

src/main/java/com/sk89q/worldedit/LocalPlayer.java

@@ -21,12 +21,12 @@ package com.sk89q.worldedit;
 
 import java.io.File;
 
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.blocks.ItemID;
-import com.sk89q.worldedit.cui.CUIEvent;
+import com.sk89q.worldedit.internal.cui.CUIEvent;
 import com.sk89q.worldedit.util.TargetBlock;
 
 /**

src/main/java/com/sk89q/worldedit/LocalSession.java

@@ -28,15 +28,15 @@ import com.sk89q.jchronic.Chronic;
 import com.sk89q.jchronic.Options;
 import com.sk89q.jchronic.utils.Span;
 import com.sk89q.jchronic.utils.Time;
-import com.sk89q.worldedit.snapshots.Snapshot;
+import com.sk89q.worldedit.world.snapshot.Snapshot;
-import com.sk89q.worldedit.tools.BrushTool;
+import com.sk89q.worldedit.command.tool.BrushTool;
-import com.sk89q.worldedit.tools.SinglePickaxe;
+import com.sk89q.worldedit.command.tool.SinglePickaxe;
-import com.sk89q.worldedit.tools.BlockTool;
+import com.sk89q.worldedit.command.tool.BlockTool;
-import com.sk89q.worldedit.tools.Tool;
+import com.sk89q.worldedit.command.tool.Tool;
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
-import com.sk89q.worldedit.cui.CUIRegion;
+import com.sk89q.worldedit.internal.cui.CUIRegion;
-import com.sk89q.worldedit.cui.CUIEvent;
+import com.sk89q.worldedit.internal.cui.CUIEvent;
-import com.sk89q.worldedit.cui.SelectionShapeEvent;
+import com.sk89q.worldedit.internal.cui.SelectionShapeEvent;
 import com.sk89q.worldedit.masks.Mask;
 import com.sk89q.worldedit.regions.CuboidRegionSelector;
 import com.sk89q.worldedit.regions.Region;

src/main/java/com/sk89q/worldedit/WorldEdit.java

@@ -23,9 +23,9 @@ import com.sk89q.minecraft.util.commands.*;
 import com.sk89q.minecraft.util.commands.Console;
 import com.sk89q.util.StringUtil;
 import com.sk89q.worldedit.CuboidClipboard.FlipDirection;
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.blocks.*;
-import com.sk89q.worldedit.commands.*;
+import com.sk89q.worldedit.command.*;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
 import com.sk89q.worldedit.masks.*;
 import com.sk89q.worldedit.patterns.*;
@@ -33,7 +33,8 @@ import com.sk89q.worldedit.regions.RegionSelector;
 import com.sk89q.worldedit.scripting.CraftScriptContext;
 import com.sk89q.worldedit.scripting.CraftScriptEngine;
 import com.sk89q.worldedit.scripting.RhinoCraftScriptEngine;
-import com.sk89q.worldedit.tools.*;
+import com.sk89q.worldedit.command.tool.*;
+import com.sk89q.worldedit.util.LogFormat;
 import com.sk89q.worldedit.util.eventbus.EventBus;
 
 import javax.script.ScriptException;

src/main/java/com/sk89q/worldedit/blocks/ChestBlock.java

@@ -29,7 +29,7 @@ import com.sk89q.jnbt.ListTag;
 import com.sk89q.jnbt.NBTUtils;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 
 /**
  * Represents a chest block.

src/main/java/com/sk89q/worldedit/blocks/ContainerBlock.java

@@ -30,7 +30,7 @@ import com.sk89q.jnbt.ListTag;
 import com.sk89q.jnbt.NBTUtils;
 import com.sk89q.jnbt.ShortTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 
 /**
  * Represents a block that stores items.

src/main/java/com/sk89q/worldedit/blocks/DispenserBlock.java

@@ -29,7 +29,7 @@ import com.sk89q.jnbt.ListTag;
 import com.sk89q.jnbt.NBTUtils;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 
 /**
  * Represents dispensers.

src/main/java/com/sk89q/worldedit/blocks/FurnaceBlock.java

@@ -30,7 +30,7 @@ import com.sk89q.jnbt.NBTUtils;
 import com.sk89q.jnbt.ShortTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 
 /**
  * Represents a furnace block.

src/main/java/com/sk89q/worldedit/blocks/LazyBlock.java

@@ -21,7 +21,7 @@ package com.sk89q.worldedit.blocks;
 
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 import com.sk89q.worldedit.extent.Extent;
 
 import static com.google.common.base.Preconditions.checkNotNull;

src/main/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java

@@ -29,8 +29,8 @@ import com.sk89q.jnbt.ShortTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.MobType;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
-import com.sk89q.worldedit.data.InvalidFormatException;
+import com.sk89q.worldedit.world.storage.InvalidFormatException;
 
 /**
  * A mob spawner block.

src/main/java/com/sk89q/worldedit/blocks/NoteBlock.java

@@ -26,7 +26,7 @@ import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 
 /**
  * A note block.

src/main/java/com/sk89q/worldedit/blocks/SignBlock.java

@@ -25,7 +25,7 @@ import java.util.Map;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 
 /**
  * Represents a sign block.

src/main/java/com/sk89q/worldedit/blocks/SkullBlock.java

@@ -26,7 +26,7 @@ import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 
 /**
  * A skull block.

src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java

@@ -28,7 +28,7 @@ import com.sk89q.worldedit.PlayerNeededException;
 import com.sk89q.worldedit.ServerInterface;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldVector;
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
 
 public class BukkitCommandSender extends LocalPlayer {
     private CommandSender sender;

src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java

@@ -32,8 +32,8 @@ import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.ServerInterface;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldVector;
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
-import com.sk89q.worldedit.cui.CUIEvent;
+import com.sk89q.worldedit.internal.cui.CUIEvent;
 
 public class BukkitPlayer extends LocalPlayer {
     private Player player;

src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java

@@ -22,7 +22,7 @@ package com.sk89q.worldedit.bukkit;
 import com.sk89q.worldedit.WorldVector;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import com.sk89q.worldedit.bags.*;
+import com.sk89q.worldedit.extent.inventory.*;
 import com.sk89q.worldedit.blocks.BaseItem;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.blocks.BlockID;

src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java

@@ -22,7 +22,7 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.TileEntityBlock;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 import com.sk89q.worldedit.foundation.Block;
 import net.minecraft.server.v1_7_R2.*;
 import org.bukkit.World;

src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -45,7 +45,7 @@ import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.ServerInterface;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditOperation;
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.bukkit.selections.CuboidSelection;
 import com.sk89q.worldedit.bukkit.selections.Polygonal2DSelection;
 import com.sk89q.worldedit.bukkit.selections.Selection;

src/main/java/com/sk89q/worldedit/command/BiomeCommands.java

@@ -1,4 +1,4 @@
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
 

src/main/java/com/sk89q/worldedit/command/BrushCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
@@ -33,19 +33,19 @@ import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldedit.commands.UtilityCommands.FlagContainer;
+import com.sk89q.worldedit.command.UtilityCommands.FlagContainer;
 import com.sk89q.worldedit.masks.BlockMask;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.patterns.SingleBlockPattern;
-import com.sk89q.worldedit.tools.BrushTool;
+import com.sk89q.worldedit.command.tool.BrushTool;
-import com.sk89q.worldedit.tools.brushes.ButcherBrush;
+import com.sk89q.worldedit.command.tool.brush.ButcherBrush;
-import com.sk89q.worldedit.tools.brushes.ClipboardBrush;
+import com.sk89q.worldedit.command.tool.brush.ClipboardBrush;
-import com.sk89q.worldedit.tools.brushes.CylinderBrush;
+import com.sk89q.worldedit.command.tool.brush.CylinderBrush;
-import com.sk89q.worldedit.tools.brushes.GravityBrush;
+import com.sk89q.worldedit.command.tool.brush.GravityBrush;
-import com.sk89q.worldedit.tools.brushes.HollowCylinderBrush;
+import com.sk89q.worldedit.command.tool.brush.HollowCylinderBrush;
-import com.sk89q.worldedit.tools.brushes.HollowSphereBrush;
+import com.sk89q.worldedit.command.tool.brush.HollowSphereBrush;
-import com.sk89q.worldedit.tools.brushes.SmoothBrush;
+import com.sk89q.worldedit.command.tool.brush.SmoothBrush;
-import com.sk89q.worldedit.tools.brushes.SphereBrush;
+import com.sk89q.worldedit.command.tool.brush.SphereBrush;
 
 /**
  * Brush shape commands.

src/main/java/com/sk89q/worldedit/command/ChunkCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@ import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.minecraft.util.commands.Logging;
 import static com.sk89q.minecraft.util.commands.Logging.LogMode.*;
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.data.LegacyChunkStore;
+import com.sk89q.worldedit.world.storage.LegacyChunkStore;
-import com.sk89q.worldedit.data.McRegionChunkStore;
+import com.sk89q.worldedit.world.storage.McRegionChunkStore;
 
 /**
  * Chunk tools.

src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;

src/main/java/com/sk89q/worldedit/command/GeneralCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;

src/main/java/com/sk89q/worldedit/command/GenerationCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import static com.sk89q.minecraft.util.commands.Logging.LogMode.ALL;
 import static com.sk89q.minecraft.util.commands.Logging.LogMode.PLACEMENT;
@@ -32,10 +32,9 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.expression.ExpressionException;
+import com.sk89q.worldedit.internal.expression.ExpressionException;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.TreeGenerator;

src/main/java/com/sk89q/worldedit/command/HistoryCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;

src/main/java/com/sk89q/worldedit/command/InsufficientArgumentsException.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.worldedit.WorldEditException;
 

src/main/java/com/sk89q/worldedit/command/NavigationCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import static com.sk89q.minecraft.util.commands.Logging.LogMode.POSITION;
 

src/main/java/com/sk89q/worldedit/command/RegionCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
@@ -26,7 +26,7 @@ import com.sk89q.minecraft.util.commands.Logging;
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldedit.expression.ExpressionException;
+import com.sk89q.worldedit.internal.expression.ExpressionException;
 import com.sk89q.worldedit.function.mask.ExistingBlockMask;
 import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.math.convolution.GaussianKernel;

src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,13 +35,13 @@ import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 import com.sk89q.worldedit.schematic.SchematicFormat;
 
 /**
  * Commands related to schematics
  *
- * @see com.sk89q.worldedit.commands.ClipboardCommands#schematic()
+ * @see com.sk89q.worldedit.command.ClipboardCommands#schematic()
  */
 public class SchematicCommands {
     private final WorldEdit we;

src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import java.io.File;
 import com.sk89q.minecraft.util.commands.Command;

src/main/java/com/sk89q/worldedit/command/SelectionCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import static com.sk89q.minecraft.util.commands.Logging.LogMode.POSITION;
 import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
@@ -31,7 +31,7 @@ import com.sk89q.minecraft.util.commands.CommandAlias;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.minecraft.util.commands.Logging;
-import com.sk89q.worldedit.Countable;
+import com.sk89q.worldedit.util.Countable;
 import com.sk89q.worldedit.CuboidClipboard;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalPlayer;
@@ -43,7 +43,7 @@ import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockType;
-import com.sk89q.worldedit.data.ChunkStore;
+import com.sk89q.worldedit.world.storage.ChunkStore;
 import com.sk89q.worldedit.regions.ConvexPolyhedralRegionSelector;
 import com.sk89q.worldedit.regions.CuboidRegionSelector;
 import com.sk89q.worldedit.regions.CylinderRegionSelector;

src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,9 +29,9 @@ import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.data.MissingWorldException;
+import com.sk89q.worldedit.world.storage.MissingWorldException;
-import com.sk89q.worldedit.snapshots.InvalidSnapshotException;
+import com.sk89q.worldedit.world.snapshot.InvalidSnapshotException;
-import com.sk89q.worldedit.snapshots.Snapshot;
+import com.sk89q.worldedit.world.snapshot.Snapshot;
 
 /**
  * Snapshot commands.

src/main/java/com/sk89q/worldedit/command/SnapshotUtilCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
 
@@ -36,13 +36,13 @@ import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.data.ChunkStore;
+import com.sk89q.worldedit.world.storage.ChunkStore;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
-import com.sk89q.worldedit.data.MissingWorldException;
+import com.sk89q.worldedit.world.storage.MissingWorldException;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.snapshots.InvalidSnapshotException;
+import com.sk89q.worldedit.world.snapshot.InvalidSnapshotException;
-import com.sk89q.worldedit.snapshots.Snapshot;
+import com.sk89q.worldedit.world.snapshot.Snapshot;
-import com.sk89q.worldedit.snapshots.SnapshotRestore;
+import com.sk89q.worldedit.world.snapshot.SnapshotRestore;
 
 public class SnapshotUtilCommands {
 

src/main/java/com/sk89q/worldedit/command/SuperPickaxeCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
@@ -28,9 +28,9 @@ import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.tools.AreaPickaxe;
+import com.sk89q.worldedit.command.tool.AreaPickaxe;
-import com.sk89q.worldedit.tools.RecursivePickaxe;
+import com.sk89q.worldedit.command.tool.RecursivePickaxe;
-import com.sk89q.worldedit.tools.SinglePickaxe;
+import com.sk89q.worldedit.command.tool.SinglePickaxe;
 
 public class SuperPickaxeCommands {
     private final WorldEdit we;

src/main/java/com/sk89q/worldedit/command/ToolCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
@@ -27,7 +27,7 @@ import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldedit.patterns.Pattern;
-import com.sk89q.worldedit.tools.*;
+import com.sk89q.worldedit.command.tool.*;
 import com.sk89q.worldedit.util.TreeGenerator;
 
 public class ToolCommands {

src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;

src/main/java/com/sk89q/worldedit/command/UtilityCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import com.sk89q.minecraft.util.commands.*;
 import com.sk89q.worldedit.*;

src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.commands;
+package com.sk89q.worldedit.command;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;

src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;

src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java

@@ -17,10 +17,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockType;
 

src/main/java/com/sk89q/worldedit/command/tool/BlockTool.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
 

src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java

@@ -17,18 +17,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.masks.CombinedMask;
 import com.sk89q.worldedit.masks.Mask;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.patterns.SingleBlockPattern;
-import com.sk89q.worldedit.tools.brushes.Brush;
+import com.sk89q.worldedit.command.tool.brush.Brush;
-import com.sk89q.worldedit.tools.brushes.SphereBrush;
+import com.sk89q.worldedit.command.tool.brush.SphereBrush;
 
 /**
  * Builds a shape at the place being looked at.

src/main/java/com/sk89q/worldedit/command/tool/DistanceWand.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.regions.RegionSelector;

src/main/java/com/sk89q/worldedit/command/tool/DoubleActionBlockTool.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalPlayer;

src/main/java/com/sk89q/worldedit/command/tool/DoubleActionTraceTool.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalPlayer;

src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import java.util.HashSet;
 import java.util.LinkedList;

src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;

src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.*;

src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BlockID;

src/main/java/com/sk89q/worldedit/command/tool/Tool.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.LocalPlayer;
 

src/main/java/com/sk89q/worldedit/command/tool/TraceTool.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalPlayer;

src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools;
+package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.util.TreeGenerator;

src/main/java/com/sk89q/worldedit/command/tool/brush/Brush.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools.brushes;
+package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

src/main/java/com/sk89q/worldedit/command/tool/brush/ButcherBrush.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.tools.brushes;
+package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

src/main/java/com/sk89q/worldedit/command/tool/brush/ClipboardBrush.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools.brushes;
+package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.CuboidClipboard;
 import com.sk89q.worldedit.EditSession;

src/main/java/com/sk89q/worldedit/command/tool/brush/CylinderBrush.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools.brushes;
+package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools.brushes;
+package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

src/main/java/com/sk89q/worldedit/command/tool/brush/HollowCylinderBrush.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools.brushes;
+package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

src/main/java/com/sk89q/worldedit/command/tool/brush/HollowSphereBrush.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools.brushes;
+package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

src/main/java/com/sk89q/worldedit/command/tool/brush/SmoothBrush.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools.brushes;
+package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.math.convolution.HeightMap;

src/main/java/com/sk89q/worldedit/command/tool/brush/SphereBrush.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.tools.brushes;
+package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;

src/main/java/com/sk89q/worldedit/extent/buffer/ForgetfulExtentBuffer.java

@@ -17,13 +17,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extent;
+package com.sk89q.worldedit.extent.buffer;
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.ExtentDelegate;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.mask.Masks;
 import com.sk89q.worldedit.function.pattern.Pattern;

src/main/java/com/sk89q/worldedit/extent/cache/LastAccessExtentCache.java

@@ -17,11 +17,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extent;
+package com.sk89q.worldedit.extent.cache;
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.ExtentDelegate;
 
 /**
  * Returns the same cached {@link BaseBlock} for repeated calls to

src/main/java/com/sk89q/worldedit/extent/inventory/BlockBag.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.bags;
+package com.sk89q.worldedit.extent.inventory;
 
 import com.sk89q.worldedit.WorldVector;
 import com.sk89q.worldedit.blocks.*;

src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagException.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.bags;
+package com.sk89q.worldedit.extent.inventory;
 
 /**
  *

src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java

@@ -17,14 +17,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extent;
+package com.sk89q.worldedit.extent.inventory;
 
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.bags.BlockBag;
+import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.bags.BlockBagException;
+import com.sk89q.worldedit.extent.ExtentDelegate;
-import com.sk89q.worldedit.bags.UnplaceableBlockException;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
+import com.sk89q.worldedit.extent.inventory.BlockBagException;
+import com.sk89q.worldedit.extent.inventory.UnplaceableBlockException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 
 import javax.annotation.Nullable;

src/main/java/com/sk89q/worldedit/extent/inventory/OutOfBlocksException.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.bags;
+package com.sk89q.worldedit.extent.inventory;
 
 /**
  *

src/main/java/com/sk89q/worldedit/extent/inventory/OutOfSpaceException.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.bags;
+package com.sk89q.worldedit.extent.inventory;
 
 /**
  *

src/main/java/com/sk89q/worldedit/extent/inventory/UnplaceableBlockException.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.bags;
+package com.sk89q.worldedit.extent.inventory;
 
 /**
  * 

src/main/java/com/sk89q/worldedit/extent/logging/AbstractLoggingExtent.java

@@ -17,11 +17,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extent;
+package com.sk89q.worldedit.extent.logging;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.ExtentDelegate;
 
 /**
  * An abstract class to implement block loggers and so on with.

src/main/java/com/sk89q/worldedit/extent/validation/BlockChangeLimiter.java

@@ -17,12 +17,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extent;
+package com.sk89q.worldedit.extent.validation;
 
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.ExtentDelegate;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

src/main/java/com/sk89q/worldedit/extent/validation/DataValidatorExtent.java

@@ -17,12 +17,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extent;
+package com.sk89q.worldedit.extent.validation;
 
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.ExtentDelegate;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

src/main/java/com/sk89q/worldedit/extent/world/BlockQuirkExtent.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extent;
+package com.sk89q.worldedit.extent.world;
 
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
@@ -25,6 +25,8 @@ import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.blocks.BlockType;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.ExtentDelegate;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

src/main/java/com/sk89q/worldedit/extent/world/ChunkLoadingExtent.java

@@ -17,12 +17,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extent;
+package com.sk89q.worldedit.extent.world;
 
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.ExtentDelegate;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

src/main/java/com/sk89q/worldedit/extent/world/FastModeExtent.java

@@ -17,13 +17,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.extent;
+package com.sk89q.worldedit.extent.world;
 
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.extent.ExtentDelegate;
 import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.function.operation.RunContext;
 

src/main/java/com/sk89q/worldedit/foundation/Block.java

@@ -23,7 +23,7 @@ import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.TileEntityBlock;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 
 /**
  * Represents a mutable copy of a block that is not tied to any 'real' block in a world.

src/main/java/com/sk89q/worldedit/foundation/NbtValued.java

@@ -19,7 +19,7 @@
 package com.sk89q.worldedit.foundation;
 
 import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.world.DataException;
 
 /**
  * Indicates an object that contains extra data identified as an NBT structure. This

src/main/java/com/sk89q/worldedit/internal/cui/CUIEvent.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.cui;
+package com.sk89q.worldedit.internal.cui;
 
 public interface CUIEvent {
 

src/main/java/com/sk89q/worldedit/internal/cui/CUIRegion.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.cui;
+package com.sk89q.worldedit.internal.cui;
 
 import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;

src/main/java/com/sk89q/worldedit/internal/cui/SelectionCylinderEvent.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.sk89q.worldedit.cui;
+package com.sk89q.worldedit.internal.cui;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;

src/main/java/com/sk89q/worldedit/internal/cui/SelectionEllipsoidPointEvent.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.cui;
+package com.sk89q.worldedit.internal.cui;
 
 import com.sk89q.worldedit.Vector;
 

src/main/java/com/sk89q/worldedit/internal/cui/SelectionMinMaxEvent.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.cui;
+package com.sk89q.worldedit.internal.cui;
 
 public class SelectionMinMaxEvent implements CUIEvent {
 

src/main/java/com/sk89q/worldedit/internal/cui/SelectionPoint2DEvent.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.cui;
+package com.sk89q.worldedit.internal.cui;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;

src/main/java/com/sk89q/worldedit/internal/cui/SelectionPointEvent.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.cui;
+package com.sk89q.worldedit.internal.cui;
 
 import com.sk89q.worldedit.Vector;
 

src/main/java/com/sk89q/worldedit/internal/cui/SelectionPolygonEvent.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.sk89q.worldedit.cui;
+package com.sk89q.worldedit.internal.cui;
 
 public class SelectionPolygonEvent implements CUIEvent {
     protected final int[] vertices;

src/main/java/com/sk89q/worldedit/internal/cui/SelectionShapeEvent.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.cui;
+package com.sk89q.worldedit.internal.cui;
 
 public class SelectionShapeEvent implements CUIEvent {
 

src/main/java/com/sk89q/worldedit/internal/expression/Expression.java

@@ -17,25 +17,23 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.expression;
+package com.sk89q.worldedit.internal.expression;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
-import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.internal.expression.lexer.Lexer;
-import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.internal.expression.lexer.tokens.Token;
-import com.sk89q.worldedit.expression.lexer.Lexer;
+import com.sk89q.worldedit.internal.expression.parser.Parser;
-import com.sk89q.worldedit.expression.lexer.tokens.Token;
+import com.sk89q.worldedit.internal.expression.runtime.ExpressionEnvironment;
-import com.sk89q.worldedit.expression.parser.Parser;
+import com.sk89q.worldedit.internal.expression.runtime.Constant;
-import com.sk89q.worldedit.expression.runtime.ExpressionEnvironment;
+import com.sk89q.worldedit.internal.expression.runtime.EvaluationException;
-import com.sk89q.worldedit.expression.runtime.Constant;
+import com.sk89q.worldedit.internal.expression.runtime.Functions;
-import com.sk89q.worldedit.expression.runtime.EvaluationException;
+import com.sk89q.worldedit.internal.expression.runtime.RValue;
-import com.sk89q.worldedit.expression.runtime.Functions;
+import com.sk89q.worldedit.internal.expression.runtime.ReturnException;
-import com.sk89q.worldedit.expression.runtime.RValue;
+import com.sk89q.worldedit.internal.expression.runtime.Variable;
-import com.sk89q.worldedit.expression.runtime.ReturnException;
-import com.sk89q.worldedit.expression.runtime.Variable;
 
 /**
  * Compiles and evaluates expressions.

src/main/java/com/sk89q/worldedit/internal/expression/ExpressionException.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.expression;
+package com.sk89q.worldedit.internal.expression;
 
 /**
  * Thrown when there's a problem during any stage of the expression compilation or evaluation.

src/main/java/com/sk89q/worldedit/internal/expression/Identifiable.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.expression;
+package com.sk89q.worldedit.internal.expression;
 
 /**
  * A common superinterface for everything passed to parser processors.

src/main/java/com/sk89q/worldedit/internal/expression/lexer/Lexer.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.expression.lexer;
+package com.sk89q.worldedit.internal.expression.lexer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,7 +29,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.sk89q.worldedit.expression.lexer.tokens.*;
+import com.sk89q.worldedit.internal.expression.lexer.tokens.*;
 
 /**
  * Processes a string into a list of tokens.

src/main/java/com/sk89q/worldedit/internal/expression/lexer/LexerException.java

@@ -17,9 +17,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.expression.lexer;
+package com.sk89q.worldedit.internal.expression.lexer;
 
-import com.sk89q.worldedit.expression.ExpressionException;
+import com.sk89q.worldedit.internal.expression.ExpressionException;
 
 /**
  * Thrown when the lexer encounters a problem.

src/main/java/com/sk89q/worldedit/internal/expression/lexer/tokens/CharacterToken.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.expression.lexer.tokens;
+package com.sk89q.worldedit.internal.expression.lexer.tokens;
 
 /**
  * A single character that doesn't fit any of the other token categories.