diff --git a/src/main/java/com/metaweb/gridworks/GridworksServlet.java b/src/main/java/com/metaweb/gridworks/GridworksServlet.java
index 2518b01ad..edaa88c1e 100644
--- a/src/main/java/com/metaweb/gridworks/GridworksServlet.java
+++ b/src/main/java/com/metaweb/gridworks/GridworksServlet.java
@@ -19,28 +19,24 @@ import com.metaweb.gridworks.commands.auth.AuthorizeCommand;
 import com.metaweb.gridworks.commands.auth.CheckAuthorizationCommand;
 import com.metaweb.gridworks.commands.auth.DeAuthorizeCommand;
 import com.metaweb.gridworks.commands.auth.GetUserBadgesCommand;
-import com.metaweb.gridworks.commands.edit.AddColumnCommand;
+import com.metaweb.gridworks.commands.cell.EditOneCellCommand;
+import com.metaweb.gridworks.commands.cell.JoinMultiValueCellsCommand;
+import com.metaweb.gridworks.commands.cell.MassEditCommand;
+import com.metaweb.gridworks.commands.cell.SplitMultiValueCellsCommand;
+import com.metaweb.gridworks.commands.cell.TextTransformCommand;
+import com.metaweb.gridworks.commands.column.AddColumnCommand;
+import com.metaweb.gridworks.commands.column.ExtendDataCommand;
+import com.metaweb.gridworks.commands.column.RemoveColumnCommand;
+import com.metaweb.gridworks.commands.column.RenameColumnCommand;
+import com.metaweb.gridworks.commands.column.SplitColumnCommand;
 import com.metaweb.gridworks.commands.edit.AnnotateOneRowCommand;
 import com.metaweb.gridworks.commands.edit.AnnotateRowsCommand;
 import com.metaweb.gridworks.commands.edit.ApplyOperationsCommand;
-import com.metaweb.gridworks.commands.edit.CreateProjectCommand;
-import com.metaweb.gridworks.commands.edit.DeleteProjectCommand;
 import com.metaweb.gridworks.commands.edit.DenormalizeCommand;
-import com.metaweb.gridworks.commands.edit.EditOneCellCommand;
-import com.metaweb.gridworks.commands.edit.ExportProjectCommand;
-import com.metaweb.gridworks.commands.edit.ExtendDataCommand;
-import com.metaweb.gridworks.commands.edit.ImportProjectCommand;
-import com.metaweb.gridworks.commands.edit.JoinMultiValueCellsCommand;
 import com.metaweb.gridworks.commands.edit.MQLReadCommand;
 import com.metaweb.gridworks.commands.edit.MQLWriteCommand;
-import com.metaweb.gridworks.commands.edit.MassEditCommand;
-import com.metaweb.gridworks.commands.edit.RemoveColumnCommand;
 import com.metaweb.gridworks.commands.edit.RemoveRowsCommand;
-import com.metaweb.gridworks.commands.edit.RenameColumnCommand;
 import com.metaweb.gridworks.commands.edit.SaveProtographCommand;
-import com.metaweb.gridworks.commands.edit.SplitColumnCommand;
-import com.metaweb.gridworks.commands.edit.SplitMultiValueCellsCommand;
-import com.metaweb.gridworks.commands.edit.TextTransformCommand;
 import com.metaweb.gridworks.commands.edit.UndoRedoCommand;
 import com.metaweb.gridworks.commands.edit.UploadDataCommand;
 import com.metaweb.gridworks.commands.info.ComputeClustersCommand;
@@ -56,6 +52,10 @@ import com.metaweb.gridworks.commands.info.GetProcessesCommand;
 import com.metaweb.gridworks.commands.info.GetProjectMetadataCommand;
 import com.metaweb.gridworks.commands.info.GetRowsCommand;
 import com.metaweb.gridworks.commands.info.GetScatterplotCommand;
+import com.metaweb.gridworks.commands.project.CreateProjectCommand;
+import com.metaweb.gridworks.commands.project.DeleteProjectCommand;
+import com.metaweb.gridworks.commands.project.ExportProjectCommand;
+import com.metaweb.gridworks.commands.project.ImportProjectCommand;
 import com.metaweb.gridworks.commands.recon.ReconDiscardJudgmentsCommand;
 import com.metaweb.gridworks.commands.recon.ReconJudgeOneCellCommand;
 import com.metaweb.gridworks.commands.recon.ReconJudgeSimilarCellsCommand;
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/EditOneCellCommand.java b/src/main/java/com/metaweb/gridworks/commands/cell/EditOneCellCommand.java
similarity index 99%
rename from src/main/java/com/metaweb/gridworks/commands/edit/EditOneCellCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/cell/EditOneCellCommand.java
index d46df28d1..275a0a262 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/EditOneCellCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/cell/EditOneCellCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.cell;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/JoinMultiValueCellsCommand.java b/src/main/java/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java
similarity index 96%
rename from src/main/java/com/metaweb/gridworks/commands/edit/JoinMultiValueCellsCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java
index 9606388a9..ba9692616 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/JoinMultiValueCellsCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.cell;
 
 import java.io.IOException;
 import java.util.Properties;
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/MassEditCommand.java b/src/main/java/com/metaweb/gridworks/commands/cell/MassEditCommand.java
similarity index 95%
rename from src/main/java/com/metaweb/gridworks/commands/edit/MassEditCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/cell/MassEditCommand.java
index a63a5c16b..5dab4bb60 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/MassEditCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/cell/MassEditCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.cell;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/SplitMultiValueCellsCommand.java b/src/main/java/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java
similarity index 96%
rename from src/main/java/com/metaweb/gridworks/commands/edit/SplitMultiValueCellsCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java
index 1134e47ed..eb4ed0499 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/SplitMultiValueCellsCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.cell;
 
   import java.io.IOException;
 import java.util.Properties;
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/TextTransformCommand.java b/src/main/java/com/metaweb/gridworks/commands/cell/TextTransformCommand.java
similarity index 96%
rename from src/main/java/com/metaweb/gridworks/commands/edit/TextTransformCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/cell/TextTransformCommand.java
index 0c0ed5d23..573bf663c 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/TextTransformCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/cell/TextTransformCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.cell;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/AddColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/AddColumnCommand.java
similarity index 96%
rename from src/main/java/com/metaweb/gridworks/commands/edit/AddColumnCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/column/AddColumnCommand.java
index 8db4315ab..2fa615f93 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/AddColumnCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/column/AddColumnCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.column;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/ExtendDataCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/ExtendDataCommand.java
similarity index 95%
rename from src/main/java/com/metaweb/gridworks/commands/edit/ExtendDataCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/column/ExtendDataCommand.java
index 01167c8c6..8e9b03647 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/ExtendDataCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/column/ExtendDataCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.column;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/RemoveColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java
similarity index 96%
rename from src/main/java/com/metaweb/gridworks/commands/edit/RemoveColumnCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java
index 4119db05a..6d1902780 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/RemoveColumnCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.column;
 
 import java.io.IOException;
 import java.util.Properties;
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/RenameColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/RenameColumnCommand.java
similarity index 96%
rename from src/main/java/com/metaweb/gridworks/commands/edit/RenameColumnCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/column/RenameColumnCommand.java
index 674e708ba..e8521424e 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/RenameColumnCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/column/RenameColumnCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.column;
 
 import java.io.IOException;
 import java.util.Properties;
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/SplitColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/SplitColumnCommand.java
similarity index 97%
rename from src/main/java/com/metaweb/gridworks/commands/edit/SplitColumnCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/column/SplitColumnCommand.java
index f21d01f87..f2d5410b9 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/SplitColumnCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/column/SplitColumnCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.column;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/CreateProjectCommand.java b/src/main/java/com/metaweb/gridworks/commands/project/CreateProjectCommand.java
similarity index 99%
rename from src/main/java/com/metaweb/gridworks/commands/edit/CreateProjectCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/project/CreateProjectCommand.java
index 880a8da83..ea48c490f 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/CreateProjectCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/project/CreateProjectCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.project;
 
 import java.io.BufferedInputStream;
 import java.io.File;
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/DeleteProjectCommand.java b/src/main/java/com/metaweb/gridworks/commands/project/DeleteProjectCommand.java
similarity index 94%
rename from src/main/java/com/metaweb/gridworks/commands/edit/DeleteProjectCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/project/DeleteProjectCommand.java
index d8199f2b2..929af5e1c 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/DeleteProjectCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/project/DeleteProjectCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.project;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/ExportProjectCommand.java b/src/main/java/com/metaweb/gridworks/commands/project/ExportProjectCommand.java
similarity index 98%
rename from src/main/java/com/metaweb/gridworks/commands/edit/ExportProjectCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/project/ExportProjectCommand.java
index aad5c2a82..31ef2e25c 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/ExportProjectCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/project/ExportProjectCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.project;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/ImportProjectCommand.java b/src/main/java/com/metaweb/gridworks/commands/project/ImportProjectCommand.java
similarity index 99%
rename from src/main/java/com/metaweb/gridworks/commands/edit/ImportProjectCommand.java
rename to src/main/java/com/metaweb/gridworks/commands/project/ImportProjectCommand.java
index 032b389e3..96ee6aae4 100644
--- a/src/main/java/com/metaweb/gridworks/commands/edit/ImportProjectCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/project/ImportProjectCommand.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.commands.edit;
+package com.metaweb.gridworks.commands.project;
 
 import java.io.File;
 import java.io.FileOutputStream;