diff --git a/src/main/java/com/sk89q/worldedit/EditSession.java b/src/main/java/com/sk89q/worldedit/EditSession.java
index 4e975d9ea..0289b99a2 100644
--- a/src/main/java/com/sk89q/worldedit/EditSession.java
+++ b/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -46,6 +46,8 @@ import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionOperationException;
+import com.sk89q.worldedit.shape.ArbitraryShape;
+import com.sk89q.worldedit.shape.WorldEditExpressionEnvironment;
 import com.sk89q.worldedit.util.TreeGenerator;
 
 /**
diff --git a/src/main/java/com/sk89q/worldedit/ArbitraryShape.java b/src/main/java/com/sk89q/worldedit/shape/ArbitraryShape.java
similarity index 94%
rename from src/main/java/com/sk89q/worldedit/ArbitraryShape.java
rename to src/main/java/com/sk89q/worldedit/shape/ArbitraryShape.java
index 601b34b3e..7d5abff09 100644
--- a/src/main/java/com/sk89q/worldedit/ArbitraryShape.java
+++ b/src/main/java/com/sk89q/worldedit/shape/ArbitraryShape.java
@@ -17,8 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit;
+package com.sk89q.worldedit.shape;
 
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.regions.Region;
diff --git a/src/main/java/com/sk89q/worldedit/WorldEditExpressionEnvironment.java b/src/main/java/com/sk89q/worldedit/shape/WorldEditExpressionEnvironment.java
similarity index 85%
rename from src/main/java/com/sk89q/worldedit/WorldEditExpressionEnvironment.java
rename to src/main/java/com/sk89q/worldedit/shape/WorldEditExpressionEnvironment.java
index 4fd46aa06..f026bc5f4 100644
--- a/src/main/java/com/sk89q/worldedit/WorldEditExpressionEnvironment.java
+++ b/src/main/java/com/sk89q/worldedit/shape/WorldEditExpressionEnvironment.java
@@ -1,8 +1,11 @@
-package com.sk89q.worldedit;
+package com.sk89q.worldedit.shape;
 
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.expression.runtime.ExpressionEnvironment;
 
-class WorldEditExpressionEnvironment implements ExpressionEnvironment {
+public class WorldEditExpressionEnvironment implements ExpressionEnvironment {
     private final Vector unit;
     private final Vector zero2;
     private Vector current = new Vector();