diff --git a/src/main/java/com/sk89q/worldedit/EditSession.java b/src/main/java/com/sk89q/worldedit/EditSession.java
index b1faffb4a..7d29b1f06 100644
--- a/src/main/java/com/sk89q/worldedit/EditSession.java
+++ b/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -27,13 +27,16 @@ import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.expression.Expression;
 import com.sk89q.worldedit.expression.ExpressionException;
 import com.sk89q.worldedit.expression.runtime.RValue;
-import com.sk89q.worldedit.generator.ForestGenerator;
-import com.sk89q.worldedit.generator.GardenPatchGenerator;
+import com.sk89q.worldedit.function.block.BlockCount;
+import com.sk89q.worldedit.function.operation.OperationHelper;
+import com.sk89q.worldedit.function.block.BlockReplace;
+import com.sk89q.worldedit.function.generator.ForestGenerator;
+import com.sk89q.worldedit.function.generator.GardenPatchGenerator;
 import com.sk89q.worldedit.interpolation.Interpolation;
 import com.sk89q.worldedit.interpolation.KochanekBartelsInterpolation;
 import com.sk89q.worldedit.interpolation.Node;
 import com.sk89q.worldedit.masks.*;
-import com.sk89q.worldedit.operation.*;
+import com.sk89q.worldedit.function.*;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.patterns.SingleBlockPattern;
 import com.sk89q.worldedit.regions.CuboidRegion;
@@ -48,10 +51,10 @@ import com.sk89q.worldedit.shape.RegionShape;
 import com.sk89q.worldedit.shape.WorldEditExpressionEnvironment;
 import com.sk89q.worldedit.util.TreeGenerator;
 import com.sk89q.worldedit.util.noise.RandomNoise;
-import com.sk89q.worldedit.visitor.DownwardVisitor;
-import com.sk89q.worldedit.visitor.FlatRegionVisitor;
-import com.sk89q.worldedit.visitor.RecursiveVisitor;
-import com.sk89q.worldedit.visitor.RegionVisitor;
+import com.sk89q.worldedit.function.visitor.DownwardVisitor;
+import com.sk89q.worldedit.function.visitor.FlatRegionVisitor;
+import com.sk89q.worldedit.function.visitor.RecursiveVisitor;
+import com.sk89q.worldedit.function.visitor.RegionVisitor;
 
 import java.util.*;
 
@@ -2123,8 +2126,8 @@ public class EditSession {
      * @param treeGenerator the tree generator
      * @return number of trees created
      * @throws MaxChangedBlocksException
-     * @deprecated Use {@link com.sk89q.worldedit.generator.ForestGenerator} with a
-     *             {@link com.sk89q.worldedit.visitor.FlatRegionVisitor}
+     * @deprecated Use {@link com.sk89q.worldedit.function.generator.ForestGenerator} with a
+     *             {@link com.sk89q.worldedit.function.visitor.FlatRegionVisitor}
      */
     @Deprecated
     public int makeForest(Iterable<Vector2D> it, int upperY, int lowerY,
diff --git a/src/main/java/com/sk89q/worldedit/commands/RegionCommands.java b/src/main/java/com/sk89q/worldedit/commands/RegionCommands.java
index ae765a52f..15572c813 100644
--- a/src/main/java/com/sk89q/worldedit/commands/RegionCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/RegionCommands.java
@@ -29,19 +29,19 @@ import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.expression.ExpressionException;
 import com.sk89q.worldedit.filtering.GaussianKernel;
 import com.sk89q.worldedit.filtering.HeightMapFilter;
-import com.sk89q.worldedit.generator.FloraGenerator;
-import com.sk89q.worldedit.generator.ForestGenerator;
+import com.sk89q.worldedit.function.generator.FloraGenerator;
+import com.sk89q.worldedit.function.generator.ForestGenerator;
 import com.sk89q.worldedit.masks.ExistingBlockMask;
 import com.sk89q.worldedit.masks.Mask2D;
 import com.sk89q.worldedit.masks.NoiseFilter2D;
-import com.sk89q.worldedit.operation.FlatRegionMaskingFilter;
-import com.sk89q.worldedit.operation.GroundFunction;
+import com.sk89q.worldedit.function.FlatRegionMaskingFilter;
+import com.sk89q.worldedit.function.GroundFunction;
 import com.sk89q.worldedit.regions.search.GroundSearch;
 import com.sk89q.worldedit.regions.search.MaskingGroundSearch;
 import com.sk89q.worldedit.util.noise.RandomNoise;
-import com.sk89q.worldedit.visitor.FlatRegionVisitor;
+import com.sk89q.worldedit.function.visitor.FlatRegionVisitor;
 import com.sk89q.worldedit.masks.Mask;
-import com.sk89q.worldedit.operation.OperationHelper;
+import com.sk89q.worldedit.function.operation.OperationHelper;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.patterns.SingleBlockPattern;
 import com.sk89q.worldedit.regions.*;
diff --git a/src/main/java/com/sk89q/worldedit/operation/FlatRegionFunction.java b/src/main/java/com/sk89q/worldedit/function/FlatRegionFunction.java
similarity index 96%
rename from src/main/java/com/sk89q/worldedit/operation/FlatRegionFunction.java
rename to src/main/java/com/sk89q/worldedit/function/FlatRegionFunction.java
index 88f1039fa..b62508d1d 100644
--- a/src/main/java/com/sk89q/worldedit/operation/FlatRegionFunction.java
+++ b/src/main/java/com/sk89q/worldedit/function/FlatRegionFunction.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.operation;
+package com.sk89q.worldedit.function;
 
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
diff --git a/src/main/java/com/sk89q/worldedit/operation/FlatRegionMaskingFilter.java b/src/main/java/com/sk89q/worldedit/function/FlatRegionMaskingFilter.java
similarity index 94%
rename from src/main/java/com/sk89q/worldedit/operation/FlatRegionMaskingFilter.java
rename to src/main/java/com/sk89q/worldedit/function/FlatRegionMaskingFilter.java
index 7a6abb656..e6bf41fba 100644
--- a/src/main/java/com/sk89q/worldedit/operation/FlatRegionMaskingFilter.java
+++ b/src/main/java/com/sk89q/worldedit/function/FlatRegionMaskingFilter.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.operation;
+package com.sk89q.worldedit.function;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector2D;
@@ -28,7 +28,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Passes calls to {@link #apply(com.sk89q.worldedit.Vector2D)} to the
- * delegate {@link com.sk89q.worldedit.operation.FlatRegionFunction} if they
+ * delegate {@link com.sk89q.worldedit.function.FlatRegionFunction} if they
  * match the given mask.
  */
 public class FlatRegionMaskingFilter implements FlatRegionFunction {
diff --git a/src/main/java/com/sk89q/worldedit/operation/GroundFunction.java b/src/main/java/com/sk89q/worldedit/function/GroundFunction.java
similarity index 98%
rename from src/main/java/com/sk89q/worldedit/operation/GroundFunction.java
rename to src/main/java/com/sk89q/worldedit/function/GroundFunction.java
index 78e90e209..ced5546ff 100644
--- a/src/main/java/com/sk89q/worldedit/operation/GroundFunction.java
+++ b/src/main/java/com/sk89q/worldedit/function/GroundFunction.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.operation;
+package com.sk89q.worldedit.function;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
diff --git a/src/main/java/com/sk89q/worldedit/operation/RegionFunction.java b/src/main/java/com/sk89q/worldedit/function/RegionFunction.java
similarity index 96%
rename from src/main/java/com/sk89q/worldedit/operation/RegionFunction.java
rename to src/main/java/com/sk89q/worldedit/function/RegionFunction.java
index 8707d7c4f..1f13a2cad 100644
--- a/src/main/java/com/sk89q/worldedit/operation/RegionFunction.java
+++ b/src/main/java/com/sk89q/worldedit/function/RegionFunction.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.operation;
+package com.sk89q.worldedit.function;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
diff --git a/src/main/java/com/sk89q/worldedit/operation/RegionMaskingFilter.java b/src/main/java/com/sk89q/worldedit/function/RegionMaskingFilter.java
similarity index 94%
rename from src/main/java/com/sk89q/worldedit/operation/RegionMaskingFilter.java
rename to src/main/java/com/sk89q/worldedit/function/RegionMaskingFilter.java
index 072f46be7..461846c5d 100644
--- a/src/main/java/com/sk89q/worldedit/operation/RegionMaskingFilter.java
+++ b/src/main/java/com/sk89q/worldedit/function/RegionMaskingFilter.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.operation;
+package com.sk89q.worldedit.function;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector;
@@ -28,7 +28,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Passes calls to {@link #apply(com.sk89q.worldedit.Vector)} to the
- * delegate {@link com.sk89q.worldedit.operation.RegionFunction} if they
+ * delegate {@link com.sk89q.worldedit.function.RegionFunction} if they
  * match the given mask.
  */
 public class RegionMaskingFilter implements RegionFunction {
diff --git a/src/main/java/com/sk89q/worldedit/operation/BlockCount.java b/src/main/java/com/sk89q/worldedit/function/block/BlockCount.java
similarity index 93%
rename from src/main/java/com/sk89q/worldedit/operation/BlockCount.java
rename to src/main/java/com/sk89q/worldedit/function/block/BlockCount.java
index 9482d141c..9a5d9fdaf 100644
--- a/src/main/java/com/sk89q/worldedit/operation/BlockCount.java
+++ b/src/main/java/com/sk89q/worldedit/function/block/BlockCount.java
@@ -17,10 +17,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.operation;
+package com.sk89q.worldedit.function.block;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.function.RegionFunction;
 
 /**
  * Counts the number of blocks.
diff --git a/src/main/java/com/sk89q/worldedit/operation/BlockReplace.java b/src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java
similarity index 94%
rename from src/main/java/com/sk89q/worldedit/operation/BlockReplace.java
rename to src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java
index 8153584ff..5298dcf66 100644
--- a/src/main/java/com/sk89q/worldedit/operation/BlockReplace.java
+++ b/src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java
@@ -17,12 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.operation;
+package com.sk89q.worldedit.function.block;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.masks.Mask;
+import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.patterns.Pattern;
 
 /**
diff --git a/src/main/java/com/sk89q/worldedit/generator/FloraGenerator.java b/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java
similarity index 97%
rename from src/main/java/com/sk89q/worldedit/generator/FloraGenerator.java
rename to src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java
index 7ddb06678..56085eee6 100644
--- a/src/main/java/com/sk89q/worldedit/generator/FloraGenerator.java
+++ b/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java
@@ -17,14 +17,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.generator;
+package com.sk89q.worldedit.function.generator;
 
 import com.sk89q.worldedit.EditSession;
 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.operation.RegionFunction;
+import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.patterns.BlockChance;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.patterns.RandomFillPattern;
diff --git a/src/main/java/com/sk89q/worldedit/generator/ForestGenerator.java b/src/main/java/com/sk89q/worldedit/function/generator/ForestGenerator.java
similarity index 95%
rename from src/main/java/com/sk89q/worldedit/generator/ForestGenerator.java
rename to src/main/java/com/sk89q/worldedit/function/generator/ForestGenerator.java
index 74b41d581..42598244d 100644
--- a/src/main/java/com/sk89q/worldedit/generator/ForestGenerator.java
+++ b/src/main/java/com/sk89q/worldedit/function/generator/ForestGenerator.java
@@ -17,14 +17,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.generator;
+package com.sk89q.worldedit.function.generator;
 
 import com.sk89q.worldedit.EditSession;
 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.operation.RegionFunction;
+import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.util.TreeGenerator;
 
 /**
diff --git a/src/main/java/com/sk89q/worldedit/generator/GardenPatchGenerator.java b/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java
similarity index 98%
rename from src/main/java/com/sk89q/worldedit/generator/GardenPatchGenerator.java
rename to src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java
index 873495ceb..2a145410b 100644
--- a/src/main/java/com/sk89q/worldedit/generator/GardenPatchGenerator.java
+++ b/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.generator;
+package com.sk89q.worldedit.function.generator;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
@@ -25,7 +25,7 @@ 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.operation.RegionFunction;
+import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.patterns.BlockChance;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.patterns.RandomFillPattern;
diff --git a/src/main/java/com/sk89q/worldedit/operation/Operation.java b/src/main/java/com/sk89q/worldedit/function/operation/Operation.java
similarity index 97%
rename from src/main/java/com/sk89q/worldedit/operation/Operation.java
rename to src/main/java/com/sk89q/worldedit/function/operation/Operation.java
index 0e6fc5f11..494ccc802 100644
--- a/src/main/java/com/sk89q/worldedit/operation/Operation.java
+++ b/src/main/java/com/sk89q/worldedit/function/operation/Operation.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.operation;
+package com.sk89q.worldedit.function.operation;
 
 import com.sk89q.worldedit.WorldEditException;
 
diff --git a/src/main/java/com/sk89q/worldedit/operation/OperationHelper.java b/src/main/java/com/sk89q/worldedit/function/operation/OperationHelper.java
similarity index 98%
rename from src/main/java/com/sk89q/worldedit/operation/OperationHelper.java
rename to src/main/java/com/sk89q/worldedit/function/operation/OperationHelper.java
index a3585646f..579045a0f 100644
--- a/src/main/java/com/sk89q/worldedit/operation/OperationHelper.java
+++ b/src/main/java/com/sk89q/worldedit/function/operation/OperationHelper.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.operation;
+package com.sk89q.worldedit.function.operation;
 
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.WorldEditException;
diff --git a/src/main/java/com/sk89q/worldedit/visitor/BreadthFirstSearch.java b/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java
similarity index 97%
rename from src/main/java/com/sk89q/worldedit/visitor/BreadthFirstSearch.java
rename to src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java
index 3b9979467..153882333 100644
--- a/src/main/java/com/sk89q/worldedit/visitor/BreadthFirstSearch.java
+++ b/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java
@@ -17,13 +17,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.visitor;
+package com.sk89q.worldedit.function.visitor;
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.operation.Operation;
-import com.sk89q.worldedit.operation.RegionFunction;
+import com.sk89q.worldedit.function.operation.Operation;
+import com.sk89q.worldedit.function.RegionFunction;
 
 import java.util.*;
 
diff --git a/src/main/java/com/sk89q/worldedit/visitor/DownwardVisitor.java b/src/main/java/com/sk89q/worldedit/function/visitor/DownwardVisitor.java
similarity index 95%
rename from src/main/java/com/sk89q/worldedit/visitor/DownwardVisitor.java
rename to src/main/java/com/sk89q/worldedit/function/visitor/DownwardVisitor.java
index 78614ebe1..a2764476f 100644
--- a/src/main/java/com/sk89q/worldedit/visitor/DownwardVisitor.java
+++ b/src/main/java/com/sk89q/worldedit/function/visitor/DownwardVisitor.java
@@ -17,12 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.visitor;
+package com.sk89q.worldedit.function.visitor;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.masks.Mask;
-import com.sk89q.worldedit.operation.RegionFunction;
+import com.sk89q.worldedit.function.RegionFunction;
 
 import java.util.List;
 
diff --git a/src/main/java/com/sk89q/worldedit/visitor/FlatRegionVisitor.java b/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java
similarity index 92%
rename from src/main/java/com/sk89q/worldedit/visitor/FlatRegionVisitor.java
rename to src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java
index 816219205..33a7dbb81 100644
--- a/src/main/java/com/sk89q/worldedit/visitor/FlatRegionVisitor.java
+++ b/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java
@@ -17,12 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.visitor;
+package com.sk89q.worldedit.function.visitor;
 
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.operation.FlatRegionFunction;
-import com.sk89q.worldedit.operation.Operation;
+import com.sk89q.worldedit.function.FlatRegionFunction;
+import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.FlatRegion;
 import com.sk89q.worldedit.regions.Region;
diff --git a/src/main/java/com/sk89q/worldedit/visitor/RecursiveVisitor.java b/src/main/java/com/sk89q/worldedit/function/visitor/RecursiveVisitor.java
similarity index 94%
rename from src/main/java/com/sk89q/worldedit/visitor/RecursiveVisitor.java
rename to src/main/java/com/sk89q/worldedit/function/visitor/RecursiveVisitor.java
index aa9ef421a..5e86da7c5 100644
--- a/src/main/java/com/sk89q/worldedit/visitor/RecursiveVisitor.java
+++ b/src/main/java/com/sk89q/worldedit/function/visitor/RecursiveVisitor.java
@@ -17,12 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.visitor;
+package com.sk89q.worldedit.function.visitor;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.masks.Mask;
-import com.sk89q.worldedit.operation.RegionFunction;
+import com.sk89q.worldedit.function.RegionFunction;
 
 /**
  * An implementation of an {@link BreadthFirstSearch} that uses a mask to
diff --git a/src/main/java/com/sk89q/worldedit/visitor/RegionVisitor.java b/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java
similarity index 91%
rename from src/main/java/com/sk89q/worldedit/visitor/RegionVisitor.java
rename to src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java
index e87bea61b..99cf2d273 100644
--- a/src/main/java/com/sk89q/worldedit/visitor/RegionVisitor.java
+++ b/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java
@@ -17,12 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.visitor;
+package com.sk89q.worldedit.function.visitor;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.operation.Operation;
-import com.sk89q.worldedit.operation.RegionFunction;
+import com.sk89q.worldedit.function.operation.Operation;
+import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.regions.Region;
 
 /**