diff --git a/main/java/com/metaweb/gridworks/GridworksServlet.java b/main/src/com/metaweb/gridworks/GridworksServlet.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/GridworksServlet.java
rename to main/src/com/metaweb/gridworks/GridworksServlet.java
diff --git a/main/java/com/metaweb/gridworks/InterProjectModel.java b/main/src/com/metaweb/gridworks/InterProjectModel.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/InterProjectModel.java
rename to main/src/com/metaweb/gridworks/InterProjectModel.java
diff --git a/main/java/com/metaweb/gridworks/Jsonizable.java b/main/src/com/metaweb/gridworks/Jsonizable.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/Jsonizable.java
rename to main/src/com/metaweb/gridworks/Jsonizable.java
diff --git a/main/java/com/metaweb/gridworks/ProjectManager.java b/main/src/com/metaweb/gridworks/ProjectManager.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/ProjectManager.java
rename to main/src/com/metaweb/gridworks/ProjectManager.java
diff --git a/main/java/com/metaweb/gridworks/ProjectMetadata.java b/main/src/com/metaweb/gridworks/ProjectMetadata.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/ProjectMetadata.java
rename to main/src/com/metaweb/gridworks/ProjectMetadata.java
diff --git a/main/java/com/metaweb/gridworks/browsing/DecoratedValue.java b/main/src/com/metaweb/gridworks/browsing/DecoratedValue.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/DecoratedValue.java
rename to main/src/com/metaweb/gridworks/browsing/DecoratedValue.java
diff --git a/main/java/com/metaweb/gridworks/browsing/Engine.java b/main/src/com/metaweb/gridworks/browsing/Engine.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/Engine.java
rename to main/src/com/metaweb/gridworks/browsing/Engine.java
diff --git a/main/java/com/metaweb/gridworks/browsing/FilteredRecords.java b/main/src/com/metaweb/gridworks/browsing/FilteredRecords.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/FilteredRecords.java
rename to main/src/com/metaweb/gridworks/browsing/FilteredRecords.java
diff --git a/main/java/com/metaweb/gridworks/browsing/FilteredRows.java b/main/src/com/metaweb/gridworks/browsing/FilteredRows.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/FilteredRows.java
rename to main/src/com/metaweb/gridworks/browsing/FilteredRows.java
diff --git a/main/java/com/metaweb/gridworks/browsing/RecordFilter.java b/main/src/com/metaweb/gridworks/browsing/RecordFilter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/RecordFilter.java
rename to main/src/com/metaweb/gridworks/browsing/RecordFilter.java
diff --git a/main/java/com/metaweb/gridworks/browsing/RecordVisitor.java b/main/src/com/metaweb/gridworks/browsing/RecordVisitor.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/RecordVisitor.java
rename to main/src/com/metaweb/gridworks/browsing/RecordVisitor.java
diff --git a/main/java/com/metaweb/gridworks/browsing/RowFilter.java b/main/src/com/metaweb/gridworks/browsing/RowFilter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/RowFilter.java
rename to main/src/com/metaweb/gridworks/browsing/RowFilter.java
diff --git a/main/java/com/metaweb/gridworks/browsing/RowVisitor.java b/main/src/com/metaweb/gridworks/browsing/RowVisitor.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/RowVisitor.java
rename to main/src/com/metaweb/gridworks/browsing/RowVisitor.java
diff --git a/main/java/com/metaweb/gridworks/browsing/facets/Facet.java b/main/src/com/metaweb/gridworks/browsing/facets/Facet.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/facets/Facet.java
rename to main/src/com/metaweb/gridworks/browsing/facets/Facet.java
diff --git a/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java b/main/src/com/metaweb/gridworks/browsing/facets/ListFacet.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java
rename to main/src/com/metaweb/gridworks/browsing/facets/ListFacet.java
diff --git a/main/java/com/metaweb/gridworks/browsing/facets/NominalFacetChoice.java b/main/src/com/metaweb/gridworks/browsing/facets/NominalFacetChoice.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/facets/NominalFacetChoice.java
rename to main/src/com/metaweb/gridworks/browsing/facets/NominalFacetChoice.java
diff --git a/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java b/main/src/com/metaweb/gridworks/browsing/facets/RangeFacet.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java
rename to main/src/com/metaweb/gridworks/browsing/facets/RangeFacet.java
diff --git a/main/java/com/metaweb/gridworks/browsing/facets/ScatterplotDrawingRowVisitor.java b/main/src/com/metaweb/gridworks/browsing/facets/ScatterplotDrawingRowVisitor.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/facets/ScatterplotDrawingRowVisitor.java
rename to main/src/com/metaweb/gridworks/browsing/facets/ScatterplotDrawingRowVisitor.java
diff --git a/main/java/com/metaweb/gridworks/browsing/facets/ScatterplotFacet.java b/main/src/com/metaweb/gridworks/browsing/facets/ScatterplotFacet.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/facets/ScatterplotFacet.java
rename to main/src/com/metaweb/gridworks/browsing/facets/ScatterplotFacet.java
diff --git a/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java b/main/src/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java
rename to main/src/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java
diff --git a/main/java/com/metaweb/gridworks/browsing/filters/AnyRowRecordFilter.java b/main/src/com/metaweb/gridworks/browsing/filters/AnyRowRecordFilter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/filters/AnyRowRecordFilter.java
rename to main/src/com/metaweb/gridworks/browsing/filters/AnyRowRecordFilter.java
diff --git a/main/java/com/metaweb/gridworks/browsing/filters/DualExpressionsNumberComparisonRowFilter.java b/main/src/com/metaweb/gridworks/browsing/filters/DualExpressionsNumberComparisonRowFilter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/filters/DualExpressionsNumberComparisonRowFilter.java
rename to main/src/com/metaweb/gridworks/browsing/filters/DualExpressionsNumberComparisonRowFilter.java
diff --git a/main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java b/main/src/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java
rename to main/src/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java
diff --git a/main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java b/main/src/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java
rename to main/src/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java
diff --git a/main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java b/main/src/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java
rename to main/src/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRecords.java b/main/src/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRecords.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRecords.java
rename to main/src/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRecords.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRows.java b/main/src/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRows.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRows.java
rename to main/src/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRows.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/ExpressionBasedRowEvaluable.java b/main/src/com/metaweb/gridworks/browsing/util/ExpressionBasedRowEvaluable.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/ExpressionBasedRowEvaluable.java
rename to main/src/com/metaweb/gridworks/browsing/util/ExpressionBasedRowEvaluable.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java b/main/src/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java
rename to main/src/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/ExpressionNumericValueBinner.java b/main/src/com/metaweb/gridworks/browsing/util/ExpressionNumericValueBinner.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/ExpressionNumericValueBinner.java
rename to main/src/com/metaweb/gridworks/browsing/util/ExpressionNumericValueBinner.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java b/main/src/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java
rename to main/src/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/NumericBinIndex.java b/main/src/com/metaweb/gridworks/browsing/util/NumericBinIndex.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/NumericBinIndex.java
rename to main/src/com/metaweb/gridworks/browsing/util/NumericBinIndex.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java b/main/src/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java
rename to main/src/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java b/main/src/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java
rename to main/src/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/RowEvaluable.java b/main/src/com/metaweb/gridworks/browsing/util/RowEvaluable.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/RowEvaluable.java
rename to main/src/com/metaweb/gridworks/browsing/util/RowEvaluable.java
diff --git a/main/java/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java b/main/src/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java
rename to main/src/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java
diff --git a/main/java/com/metaweb/gridworks/clustering/Clusterer.java b/main/src/com/metaweb/gridworks/clustering/Clusterer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/clustering/Clusterer.java
rename to main/src/com/metaweb/gridworks/clustering/Clusterer.java
diff --git a/main/java/com/metaweb/gridworks/clustering/binning/BinningClusterer.java b/main/src/com/metaweb/gridworks/clustering/binning/BinningClusterer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/clustering/binning/BinningClusterer.java
rename to main/src/com/metaweb/gridworks/clustering/binning/BinningClusterer.java
diff --git a/main/java/com/metaweb/gridworks/clustering/binning/DoubleMetaphoneKeyer.java b/main/src/com/metaweb/gridworks/clustering/binning/DoubleMetaphoneKeyer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/clustering/binning/DoubleMetaphoneKeyer.java
rename to main/src/com/metaweb/gridworks/clustering/binning/DoubleMetaphoneKeyer.java
diff --git a/main/java/com/metaweb/gridworks/clustering/binning/FingerprintKeyer.java b/main/src/com/metaweb/gridworks/clustering/binning/FingerprintKeyer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/clustering/binning/FingerprintKeyer.java
rename to main/src/com/metaweb/gridworks/clustering/binning/FingerprintKeyer.java
diff --git a/main/java/com/metaweb/gridworks/clustering/binning/Keyer.java b/main/src/com/metaweb/gridworks/clustering/binning/Keyer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/clustering/binning/Keyer.java
rename to main/src/com/metaweb/gridworks/clustering/binning/Keyer.java
diff --git a/main/java/com/metaweb/gridworks/clustering/binning/MetaphoneKeyer.java b/main/src/com/metaweb/gridworks/clustering/binning/MetaphoneKeyer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/clustering/binning/MetaphoneKeyer.java
rename to main/src/com/metaweb/gridworks/clustering/binning/MetaphoneKeyer.java
diff --git a/main/java/com/metaweb/gridworks/clustering/binning/NGramFingerprintKeyer.java b/main/src/com/metaweb/gridworks/clustering/binning/NGramFingerprintKeyer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/clustering/binning/NGramFingerprintKeyer.java
rename to main/src/com/metaweb/gridworks/clustering/binning/NGramFingerprintKeyer.java
diff --git a/main/java/com/metaweb/gridworks/clustering/binning/SoundexKeyer.java b/main/src/com/metaweb/gridworks/clustering/binning/SoundexKeyer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/clustering/binning/SoundexKeyer.java
rename to main/src/com/metaweb/gridworks/clustering/binning/SoundexKeyer.java
diff --git a/main/java/com/metaweb/gridworks/clustering/knn/kNNClusterer.java b/main/src/com/metaweb/gridworks/clustering/knn/kNNClusterer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/clustering/knn/kNNClusterer.java
rename to main/src/com/metaweb/gridworks/clustering/knn/kNNClusterer.java
diff --git a/main/java/com/metaweb/gridworks/commands/Command.java b/main/src/com/metaweb/gridworks/commands/Command.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/Command.java
rename to main/src/com/metaweb/gridworks/commands/Command.java
diff --git a/main/java/com/metaweb/gridworks/commands/EngineDependentCommand.java b/main/src/com/metaweb/gridworks/commands/EngineDependentCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/EngineDependentCommand.java
rename to main/src/com/metaweb/gridworks/commands/EngineDependentCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/auth/AuthorizeCommand.java b/main/src/com/metaweb/gridworks/commands/auth/AuthorizeCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/auth/AuthorizeCommand.java
rename to main/src/com/metaweb/gridworks/commands/auth/AuthorizeCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/auth/CheckAuthorizationCommand.java b/main/src/com/metaweb/gridworks/commands/auth/CheckAuthorizationCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/auth/CheckAuthorizationCommand.java
rename to main/src/com/metaweb/gridworks/commands/auth/CheckAuthorizationCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/auth/DeAuthorizeCommand.java b/main/src/com/metaweb/gridworks/commands/auth/DeAuthorizeCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/auth/DeAuthorizeCommand.java
rename to main/src/com/metaweb/gridworks/commands/auth/DeAuthorizeCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/auth/GetUserBadgesCommand.java b/main/src/com/metaweb/gridworks/commands/auth/GetUserBadgesCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/auth/GetUserBadgesCommand.java
rename to main/src/com/metaweb/gridworks/commands/auth/GetUserBadgesCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/browsing/ComputeClustersCommand.java b/main/src/com/metaweb/gridworks/commands/browsing/ComputeClustersCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/browsing/ComputeClustersCommand.java
rename to main/src/com/metaweb/gridworks/commands/browsing/ComputeClustersCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/browsing/ComputeFacetsCommand.java b/main/src/com/metaweb/gridworks/commands/browsing/ComputeFacetsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/browsing/ComputeFacetsCommand.java
rename to main/src/com/metaweb/gridworks/commands/browsing/ComputeFacetsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java b/main/src/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java
rename to main/src/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/cell/EditOneCellCommand.java b/main/src/com/metaweb/gridworks/commands/cell/EditOneCellCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/cell/EditOneCellCommand.java
rename to main/src/com/metaweb/gridworks/commands/cell/EditOneCellCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java b/main/src/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java
rename to main/src/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/cell/MassEditCommand.java b/main/src/com/metaweb/gridworks/commands/cell/MassEditCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/cell/MassEditCommand.java
rename to main/src/com/metaweb/gridworks/commands/cell/MassEditCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java b/main/src/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java
rename to main/src/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/cell/TextTransformCommand.java b/main/src/com/metaweb/gridworks/commands/cell/TextTransformCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/cell/TextTransformCommand.java
rename to main/src/com/metaweb/gridworks/commands/cell/TextTransformCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/column/AddColumnCommand.java b/main/src/com/metaweb/gridworks/commands/column/AddColumnCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/column/AddColumnCommand.java
rename to main/src/com/metaweb/gridworks/commands/column/AddColumnCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/column/ExtendDataCommand.java b/main/src/com/metaweb/gridworks/commands/column/ExtendDataCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/column/ExtendDataCommand.java
rename to main/src/com/metaweb/gridworks/commands/column/ExtendDataCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/column/GetColumnsInfoCommand.java b/main/src/com/metaweb/gridworks/commands/column/GetColumnsInfoCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/column/GetColumnsInfoCommand.java
rename to main/src/com/metaweb/gridworks/commands/column/GetColumnsInfoCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/column/PreviewExtendDataCommand.java b/main/src/com/metaweb/gridworks/commands/column/PreviewExtendDataCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/column/PreviewExtendDataCommand.java
rename to main/src/com/metaweb/gridworks/commands/column/PreviewExtendDataCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java b/main/src/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java
rename to main/src/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/column/RenameColumnCommand.java b/main/src/com/metaweb/gridworks/commands/column/RenameColumnCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/column/RenameColumnCommand.java
rename to main/src/com/metaweb/gridworks/commands/column/RenameColumnCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/column/SplitColumnCommand.java b/main/src/com/metaweb/gridworks/commands/column/SplitColumnCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/column/SplitColumnCommand.java
rename to main/src/com/metaweb/gridworks/commands/column/SplitColumnCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/expr/GetExpressionHistoryCommand.java b/main/src/com/metaweb/gridworks/commands/expr/GetExpressionHistoryCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/expr/GetExpressionHistoryCommand.java
rename to main/src/com/metaweb/gridworks/commands/expr/GetExpressionHistoryCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/expr/GetExpressionLanguageInfoCommand.java b/main/src/com/metaweb/gridworks/commands/expr/GetExpressionLanguageInfoCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/expr/GetExpressionLanguageInfoCommand.java
rename to main/src/com/metaweb/gridworks/commands/expr/GetExpressionLanguageInfoCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/expr/LogExpressionCommand.java b/main/src/com/metaweb/gridworks/commands/expr/LogExpressionCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/expr/LogExpressionCommand.java
rename to main/src/com/metaweb/gridworks/commands/expr/LogExpressionCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/expr/PreviewExpressionCommand.java b/main/src/com/metaweb/gridworks/commands/expr/PreviewExpressionCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/expr/PreviewExpressionCommand.java
rename to main/src/com/metaweb/gridworks/commands/expr/PreviewExpressionCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/freebase/GuessTypesOfColumnCommand.java b/main/src/com/metaweb/gridworks/commands/freebase/GuessTypesOfColumnCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/freebase/GuessTypesOfColumnCommand.java
rename to main/src/com/metaweb/gridworks/commands/freebase/GuessTypesOfColumnCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/freebase/MQLReadCommand.java b/main/src/com/metaweb/gridworks/commands/freebase/MQLReadCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/freebase/MQLReadCommand.java
rename to main/src/com/metaweb/gridworks/commands/freebase/MQLReadCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/freebase/MQLWriteCommand.java b/main/src/com/metaweb/gridworks/commands/freebase/MQLWriteCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/freebase/MQLWriteCommand.java
rename to main/src/com/metaweb/gridworks/commands/freebase/MQLWriteCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/freebase/PreviewProtographCommand.java b/main/src/com/metaweb/gridworks/commands/freebase/PreviewProtographCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/freebase/PreviewProtographCommand.java
rename to main/src/com/metaweb/gridworks/commands/freebase/PreviewProtographCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/freebase/SaveProtographCommand.java b/main/src/com/metaweb/gridworks/commands/freebase/SaveProtographCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/freebase/SaveProtographCommand.java
rename to main/src/com/metaweb/gridworks/commands/freebase/SaveProtographCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/freebase/UploadDataCommand.java b/main/src/com/metaweb/gridworks/commands/freebase/UploadDataCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/freebase/UploadDataCommand.java
rename to main/src/com/metaweb/gridworks/commands/freebase/UploadDataCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/history/ApplyOperationsCommand.java b/main/src/com/metaweb/gridworks/commands/history/ApplyOperationsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/history/ApplyOperationsCommand.java
rename to main/src/com/metaweb/gridworks/commands/history/ApplyOperationsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/history/CancelProcessesCommand.java b/main/src/com/metaweb/gridworks/commands/history/CancelProcessesCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/history/CancelProcessesCommand.java
rename to main/src/com/metaweb/gridworks/commands/history/CancelProcessesCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/history/GetHistoryCommand.java b/main/src/com/metaweb/gridworks/commands/history/GetHistoryCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/history/GetHistoryCommand.java
rename to main/src/com/metaweb/gridworks/commands/history/GetHistoryCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/history/GetOperationsCommand.java b/main/src/com/metaweb/gridworks/commands/history/GetOperationsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/history/GetOperationsCommand.java
rename to main/src/com/metaweb/gridworks/commands/history/GetOperationsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/history/GetProcessesCommand.java b/main/src/com/metaweb/gridworks/commands/history/GetProcessesCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/history/GetProcessesCommand.java
rename to main/src/com/metaweb/gridworks/commands/history/GetProcessesCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/history/UndoRedoCommand.java b/main/src/com/metaweb/gridworks/commands/history/UndoRedoCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/history/UndoRedoCommand.java
rename to main/src/com/metaweb/gridworks/commands/history/UndoRedoCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/project/CreateProjectCommand.java b/main/src/com/metaweb/gridworks/commands/project/CreateProjectCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/project/CreateProjectCommand.java
rename to main/src/com/metaweb/gridworks/commands/project/CreateProjectCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/project/DeleteProjectCommand.java b/main/src/com/metaweb/gridworks/commands/project/DeleteProjectCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/project/DeleteProjectCommand.java
rename to main/src/com/metaweb/gridworks/commands/project/DeleteProjectCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/project/ExportProjectCommand.java b/main/src/com/metaweb/gridworks/commands/project/ExportProjectCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/project/ExportProjectCommand.java
rename to main/src/com/metaweb/gridworks/commands/project/ExportProjectCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/project/ExportRowsCommand.java b/main/src/com/metaweb/gridworks/commands/project/ExportRowsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/project/ExportRowsCommand.java
rename to main/src/com/metaweb/gridworks/commands/project/ExportRowsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/project/GetModelsCommand.java b/main/src/com/metaweb/gridworks/commands/project/GetModelsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/project/GetModelsCommand.java
rename to main/src/com/metaweb/gridworks/commands/project/GetModelsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/project/GetProjectMetadataCommand.java b/main/src/com/metaweb/gridworks/commands/project/GetProjectMetadataCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/project/GetProjectMetadataCommand.java
rename to main/src/com/metaweb/gridworks/commands/project/GetProjectMetadataCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/project/ImportProjectCommand.java b/main/src/com/metaweb/gridworks/commands/project/ImportProjectCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/project/ImportProjectCommand.java
rename to main/src/com/metaweb/gridworks/commands/project/ImportProjectCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/project/RenameProjectCommand.java b/main/src/com/metaweb/gridworks/commands/project/RenameProjectCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/project/RenameProjectCommand.java
rename to main/src/com/metaweb/gridworks/commands/project/RenameProjectCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java b/main/src/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java
rename to main/src/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/recon/ReconJudgeOneCellCommand.java b/main/src/com/metaweb/gridworks/commands/recon/ReconJudgeOneCellCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/recon/ReconJudgeOneCellCommand.java
rename to main/src/com/metaweb/gridworks/commands/recon/ReconJudgeOneCellCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/recon/ReconJudgeSimilarCellsCommand.java b/main/src/com/metaweb/gridworks/commands/recon/ReconJudgeSimilarCellsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/recon/ReconJudgeSimilarCellsCommand.java
rename to main/src/com/metaweb/gridworks/commands/recon/ReconJudgeSimilarCellsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java b/main/src/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java
rename to main/src/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java b/main/src/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java
rename to main/src/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.java b/main/src/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.java
rename to main/src/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java b/main/src/com/metaweb/gridworks/commands/recon/ReconcileCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java
rename to main/src/com/metaweb/gridworks/commands/recon/ReconcileCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/row/AnnotateOneRowCommand.java b/main/src/com/metaweb/gridworks/commands/row/AnnotateOneRowCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/row/AnnotateOneRowCommand.java
rename to main/src/com/metaweb/gridworks/commands/row/AnnotateOneRowCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/row/AnnotateRowsCommand.java b/main/src/com/metaweb/gridworks/commands/row/AnnotateRowsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/row/AnnotateRowsCommand.java
rename to main/src/com/metaweb/gridworks/commands/row/AnnotateRowsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/row/DenormalizeCommand.java b/main/src/com/metaweb/gridworks/commands/row/DenormalizeCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/row/DenormalizeCommand.java
rename to main/src/com/metaweb/gridworks/commands/row/DenormalizeCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/row/GetRowsCommand.java b/main/src/com/metaweb/gridworks/commands/row/GetRowsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/row/GetRowsCommand.java
rename to main/src/com/metaweb/gridworks/commands/row/GetRowsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/row/RemoveRowsCommand.java b/main/src/com/metaweb/gridworks/commands/row/RemoveRowsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/row/RemoveRowsCommand.java
rename to main/src/com/metaweb/gridworks/commands/row/RemoveRowsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/row/ReorderRowsCommand.java b/main/src/com/metaweb/gridworks/commands/row/ReorderRowsCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/row/ReorderRowsCommand.java
rename to main/src/com/metaweb/gridworks/commands/row/ReorderRowsCommand.java
diff --git a/main/java/com/metaweb/gridworks/commands/workspace/GetAllProjectMetadataCommand.java b/main/src/com/metaweb/gridworks/commands/workspace/GetAllProjectMetadataCommand.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/commands/workspace/GetAllProjectMetadataCommand.java
rename to main/src/com/metaweb/gridworks/commands/workspace/GetAllProjectMetadataCommand.java
diff --git a/main/java/com/metaweb/gridworks/exporters/CsvExporter.java b/main/src/com/metaweb/gridworks/exporters/CsvExporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/exporters/CsvExporter.java
rename to main/src/com/metaweb/gridworks/exporters/CsvExporter.java
diff --git a/main/java/com/metaweb/gridworks/exporters/Exporter.java b/main/src/com/metaweb/gridworks/exporters/Exporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/exporters/Exporter.java
rename to main/src/com/metaweb/gridworks/exporters/Exporter.java
diff --git a/main/java/com/metaweb/gridworks/exporters/HtmlTableExporter.java b/main/src/com/metaweb/gridworks/exporters/HtmlTableExporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/exporters/HtmlTableExporter.java
rename to main/src/com/metaweb/gridworks/exporters/HtmlTableExporter.java
diff --git a/main/java/com/metaweb/gridworks/exporters/ProtographTransposeExporter.java b/main/src/com/metaweb/gridworks/exporters/ProtographTransposeExporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/exporters/ProtographTransposeExporter.java
rename to main/src/com/metaweb/gridworks/exporters/ProtographTransposeExporter.java
diff --git a/main/java/com/metaweb/gridworks/exporters/TemplatingExporter.java b/main/src/com/metaweb/gridworks/exporters/TemplatingExporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/exporters/TemplatingExporter.java
rename to main/src/com/metaweb/gridworks/exporters/TemplatingExporter.java
diff --git a/main/java/com/metaweb/gridworks/exporters/XlsExporter.java b/main/src/com/metaweb/gridworks/exporters/XlsExporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/exporters/XlsExporter.java
rename to main/src/com/metaweb/gridworks/exporters/XlsExporter.java
diff --git a/main/java/com/metaweb/gridworks/expr/CellTuple.java b/main/src/com/metaweb/gridworks/expr/CellTuple.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/CellTuple.java
rename to main/src/com/metaweb/gridworks/expr/CellTuple.java
diff --git a/main/java/com/metaweb/gridworks/expr/EvalError.java b/main/src/com/metaweb/gridworks/expr/EvalError.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/EvalError.java
rename to main/src/com/metaweb/gridworks/expr/EvalError.java
diff --git a/main/java/com/metaweb/gridworks/expr/Evaluable.java b/main/src/com/metaweb/gridworks/expr/Evaluable.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/Evaluable.java
rename to main/src/com/metaweb/gridworks/expr/Evaluable.java
diff --git a/main/java/com/metaweb/gridworks/expr/ExpressionUtils.java b/main/src/com/metaweb/gridworks/expr/ExpressionUtils.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/ExpressionUtils.java
rename to main/src/com/metaweb/gridworks/expr/ExpressionUtils.java
diff --git a/main/java/com/metaweb/gridworks/expr/HasFields.java b/main/src/com/metaweb/gridworks/expr/HasFields.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/HasFields.java
rename to main/src/com/metaweb/gridworks/expr/HasFields.java
diff --git a/main/java/com/metaweb/gridworks/expr/HasFieldsList.java b/main/src/com/metaweb/gridworks/expr/HasFieldsList.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/HasFieldsList.java
rename to main/src/com/metaweb/gridworks/expr/HasFieldsList.java
diff --git a/main/java/com/metaweb/gridworks/expr/HasFieldsListImpl.java b/main/src/com/metaweb/gridworks/expr/HasFieldsListImpl.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/HasFieldsListImpl.java
rename to main/src/com/metaweb/gridworks/expr/HasFieldsListImpl.java
diff --git a/main/java/com/metaweb/gridworks/expr/JythonEvaluable.java b/main/src/com/metaweb/gridworks/expr/JythonEvaluable.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/JythonEvaluable.java
rename to main/src/com/metaweb/gridworks/expr/JythonEvaluable.java
diff --git a/main/java/com/metaweb/gridworks/expr/JythonHasFieldsWrapper.java b/main/src/com/metaweb/gridworks/expr/JythonHasFieldsWrapper.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/JythonHasFieldsWrapper.java
rename to main/src/com/metaweb/gridworks/expr/JythonHasFieldsWrapper.java
diff --git a/main/java/com/metaweb/gridworks/expr/JythonObjectWrapper.java b/main/src/com/metaweb/gridworks/expr/JythonObjectWrapper.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/JythonObjectWrapper.java
rename to main/src/com/metaweb/gridworks/expr/JythonObjectWrapper.java
diff --git a/main/java/com/metaweb/gridworks/expr/MetaParser.java b/main/src/com/metaweb/gridworks/expr/MetaParser.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/MetaParser.java
rename to main/src/com/metaweb/gridworks/expr/MetaParser.java
diff --git a/main/java/com/metaweb/gridworks/expr/ParsingException.java b/main/src/com/metaweb/gridworks/expr/ParsingException.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/ParsingException.java
rename to main/src/com/metaweb/gridworks/expr/ParsingException.java
diff --git a/main/java/com/metaweb/gridworks/expr/WrappedCell.java b/main/src/com/metaweb/gridworks/expr/WrappedCell.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/WrappedCell.java
rename to main/src/com/metaweb/gridworks/expr/WrappedCell.java
diff --git a/main/java/com/metaweb/gridworks/expr/WrappedRow.java b/main/src/com/metaweb/gridworks/expr/WrappedRow.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/WrappedRow.java
rename to main/src/com/metaweb/gridworks/expr/WrappedRow.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/Cross.java b/main/src/com/metaweb/gridworks/expr/functions/Cross.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/Cross.java
rename to main/src/com/metaweb/gridworks/expr/functions/Cross.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/FacetCount.java b/main/src/com/metaweb/gridworks/expr/functions/FacetCount.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/FacetCount.java
rename to main/src/com/metaweb/gridworks/expr/functions/FacetCount.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/Get.java b/main/src/com/metaweb/gridworks/expr/functions/Get.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/Get.java
rename to main/src/com/metaweb/gridworks/expr/functions/Get.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/Jsonize.java b/main/src/com/metaweb/gridworks/expr/functions/Jsonize.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/Jsonize.java
rename to main/src/com/metaweb/gridworks/expr/functions/Jsonize.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/Length.java b/main/src/com/metaweb/gridworks/expr/functions/Length.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/Length.java
rename to main/src/com/metaweb/gridworks/expr/functions/Length.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/Slice.java b/main/src/com/metaweb/gridworks/expr/functions/Slice.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/Slice.java
rename to main/src/com/metaweb/gridworks/expr/functions/Slice.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/ToDate.java b/main/src/com/metaweb/gridworks/expr/functions/ToDate.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/ToDate.java
rename to main/src/com/metaweb/gridworks/expr/functions/ToDate.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/ToNumber.java b/main/src/com/metaweb/gridworks/expr/functions/ToNumber.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/ToNumber.java
rename to main/src/com/metaweb/gridworks/expr/functions/ToNumber.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/ToString.java b/main/src/com/metaweb/gridworks/expr/functions/ToString.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/ToString.java
rename to main/src/com/metaweb/gridworks/expr/functions/ToString.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/Type.java b/main/src/com/metaweb/gridworks/expr/functions/Type.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/Type.java
rename to main/src/com/metaweb/gridworks/expr/functions/Type.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/arrays/ArgsToArray.java b/main/src/com/metaweb/gridworks/expr/functions/arrays/ArgsToArray.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/arrays/ArgsToArray.java
rename to main/src/com/metaweb/gridworks/expr/functions/arrays/ArgsToArray.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java b/main/src/com/metaweb/gridworks/expr/functions/arrays/Join.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java
rename to main/src/com/metaweb/gridworks/expr/functions/arrays/Join.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java b/main/src/com/metaweb/gridworks/expr/functions/arrays/Reverse.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java
rename to main/src/com/metaweb/gridworks/expr/functions/arrays/Reverse.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java b/main/src/com/metaweb/gridworks/expr/functions/arrays/Sort.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java
rename to main/src/com/metaweb/gridworks/expr/functions/arrays/Sort.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/booleans/And.java b/main/src/com/metaweb/gridworks/expr/functions/booleans/And.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/booleans/And.java
rename to main/src/com/metaweb/gridworks/expr/functions/booleans/And.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java b/main/src/com/metaweb/gridworks/expr/functions/booleans/Not.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java
rename to main/src/com/metaweb/gridworks/expr/functions/booleans/Not.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java b/main/src/com/metaweb/gridworks/expr/functions/booleans/Or.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java
rename to main/src/com/metaweb/gridworks/expr/functions/booleans/Or.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/date/DatePart.java b/main/src/com/metaweb/gridworks/expr/functions/date/DatePart.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/date/DatePart.java
rename to main/src/com/metaweb/gridworks/expr/functions/date/DatePart.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/date/Inc.java b/main/src/com/metaweb/gridworks/expr/functions/date/Inc.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/date/Inc.java
rename to main/src/com/metaweb/gridworks/expr/functions/date/Inc.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/date/Now.java b/main/src/com/metaweb/gridworks/expr/functions/date/Now.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/date/Now.java
rename to main/src/com/metaweb/gridworks/expr/functions/date/Now.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java b/main/src/com/metaweb/gridworks/expr/functions/math/Ceil.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Ceil.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Exp.java b/main/src/com/metaweb/gridworks/expr/functions/math/Exp.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Exp.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Exp.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Floor.java b/main/src/com/metaweb/gridworks/expr/functions/math/Floor.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Floor.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Floor.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Ln.java b/main/src/com/metaweb/gridworks/expr/functions/math/Ln.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Ln.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Ln.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Log.java b/main/src/com/metaweb/gridworks/expr/functions/math/Log.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Log.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Log.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Max.java b/main/src/com/metaweb/gridworks/expr/functions/math/Max.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Max.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Max.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Min.java b/main/src/com/metaweb/gridworks/expr/functions/math/Min.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Min.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Min.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Mod.java b/main/src/com/metaweb/gridworks/expr/functions/math/Mod.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Mod.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Mod.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Pow.java b/main/src/com/metaweb/gridworks/expr/functions/math/Pow.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Pow.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Pow.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Round.java b/main/src/com/metaweb/gridworks/expr/functions/math/Round.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Round.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Round.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/math/Sum.java b/main/src/com/metaweb/gridworks/expr/functions/math/Sum.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/math/Sum.java
rename to main/src/com/metaweb/gridworks/expr/functions/math/Sum.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Chomp.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Chomp.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Chomp.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Chomp.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Contains.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Contains.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Contains.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Contains.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Diff.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Diff.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Diff.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Diff.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java b/main/src/com/metaweb/gridworks/expr/functions/strings/EndsWith.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/EndsWith.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Fingerprint.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Fingerprint.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Fingerprint.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Fingerprint.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java b/main/src/com/metaweb/gridworks/expr/functions/strings/IndexOf.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/IndexOf.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java b/main/src/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/MD5.java b/main/src/com/metaweb/gridworks/expr/functions/strings/MD5.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/MD5.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/MD5.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/NGramFingerprint.java b/main/src/com/metaweb/gridworks/expr/functions/strings/NGramFingerprint.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/NGramFingerprint.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/NGramFingerprint.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Partition.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Partition.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Partition.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Partition.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Phonetic.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Phonetic.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Phonetic.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Phonetic.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/RPartition.java b/main/src/com/metaweb/gridworks/expr/functions/strings/RPartition.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/RPartition.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/RPartition.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Reinterpret.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Reinterpret.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Reinterpret.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Reinterpret.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Replace.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Replace.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceChars.java b/main/src/com/metaweb/gridworks/expr/functions/strings/ReplaceChars.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceChars.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/ReplaceChars.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/SHA1.java b/main/src/com/metaweb/gridworks/expr/functions/strings/SHA1.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/SHA1.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/SHA1.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Split.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Split.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Split.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Split.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/SplitByCharType.java b/main/src/com/metaweb/gridworks/expr/functions/strings/SplitByCharType.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/SplitByCharType.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/SplitByCharType.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/SplitByLengths.java b/main/src/com/metaweb/gridworks/expr/functions/strings/SplitByLengths.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/SplitByLengths.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/SplitByLengths.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java b/main/src/com/metaweb/gridworks/expr/functions/strings/StartsWith.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/StartsWith.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java b/main/src/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java b/main/src/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java b/main/src/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Trim.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Trim.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Trim.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Trim.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Unescape.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Unescape.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Unescape.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Unescape.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/Unicode.java b/main/src/com/metaweb/gridworks/expr/functions/strings/Unicode.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/Unicode.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/Unicode.java
diff --git a/main/java/com/metaweb/gridworks/expr/functions/strings/UnicodeType.java b/main/src/com/metaweb/gridworks/expr/functions/strings/UnicodeType.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/functions/strings/UnicodeType.java
rename to main/src/com/metaweb/gridworks/expr/functions/strings/UnicodeType.java
diff --git a/main/java/com/metaweb/gridworks/expr/util/CalendarParser.java b/main/src/com/metaweb/gridworks/expr/util/CalendarParser.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/util/CalendarParser.java
rename to main/src/com/metaweb/gridworks/expr/util/CalendarParser.java
diff --git a/main/java/com/metaweb/gridworks/expr/util/CalendarParserException.java b/main/src/com/metaweb/gridworks/expr/util/CalendarParserException.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/expr/util/CalendarParserException.java
rename to main/src/com/metaweb/gridworks/expr/util/CalendarParserException.java
diff --git a/main/java/com/metaweb/gridworks/gel/Control.java b/main/src/com/metaweb/gridworks/gel/Control.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/Control.java
rename to main/src/com/metaweb/gridworks/gel/Control.java
diff --git a/main/java/com/metaweb/gridworks/gel/ControlFunctionRegistry.java b/main/src/com/metaweb/gridworks/gel/ControlFunctionRegistry.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/ControlFunctionRegistry.java
rename to main/src/com/metaweb/gridworks/gel/ControlFunctionRegistry.java
diff --git a/main/java/com/metaweb/gridworks/gel/Function.java b/main/src/com/metaweb/gridworks/gel/Function.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/Function.java
rename to main/src/com/metaweb/gridworks/gel/Function.java
diff --git a/main/java/com/metaweb/gridworks/gel/Parser.java b/main/src/com/metaweb/gridworks/gel/Parser.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/Parser.java
rename to main/src/com/metaweb/gridworks/gel/Parser.java
diff --git a/main/java/com/metaweb/gridworks/gel/Scanner.java b/main/src/com/metaweb/gridworks/gel/Scanner.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/Scanner.java
rename to main/src/com/metaweb/gridworks/gel/Scanner.java
diff --git a/main/java/com/metaweb/gridworks/gel/ast/ControlCallExpr.java b/main/src/com/metaweb/gridworks/gel/ast/ControlCallExpr.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/ast/ControlCallExpr.java
rename to main/src/com/metaweb/gridworks/gel/ast/ControlCallExpr.java
diff --git a/main/java/com/metaweb/gridworks/gel/ast/FieldAccessorExpr.java b/main/src/com/metaweb/gridworks/gel/ast/FieldAccessorExpr.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/ast/FieldAccessorExpr.java
rename to main/src/com/metaweb/gridworks/gel/ast/FieldAccessorExpr.java
diff --git a/main/java/com/metaweb/gridworks/gel/ast/FunctionCallExpr.java b/main/src/com/metaweb/gridworks/gel/ast/FunctionCallExpr.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/ast/FunctionCallExpr.java
rename to main/src/com/metaweb/gridworks/gel/ast/FunctionCallExpr.java
diff --git a/main/java/com/metaweb/gridworks/gel/ast/LiteralExpr.java b/main/src/com/metaweb/gridworks/gel/ast/LiteralExpr.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/ast/LiteralExpr.java
rename to main/src/com/metaweb/gridworks/gel/ast/LiteralExpr.java
diff --git a/main/java/com/metaweb/gridworks/gel/ast/OperatorCallExpr.java b/main/src/com/metaweb/gridworks/gel/ast/OperatorCallExpr.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/ast/OperatorCallExpr.java
rename to main/src/com/metaweb/gridworks/gel/ast/OperatorCallExpr.java
diff --git a/main/java/com/metaweb/gridworks/gel/ast/VariableExpr.java b/main/src/com/metaweb/gridworks/gel/ast/VariableExpr.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/ast/VariableExpr.java
rename to main/src/com/metaweb/gridworks/gel/ast/VariableExpr.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/ForEach.java b/main/src/com/metaweb/gridworks/gel/controls/ForEach.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/ForEach.java
rename to main/src/com/metaweb/gridworks/gel/controls/ForEach.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/ForNonBlank.java b/main/src/com/metaweb/gridworks/gel/controls/ForNonBlank.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/ForNonBlank.java
rename to main/src/com/metaweb/gridworks/gel/controls/ForNonBlank.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/If.java b/main/src/com/metaweb/gridworks/gel/controls/If.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/If.java
rename to main/src/com/metaweb/gridworks/gel/controls/If.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/IsBlank.java b/main/src/com/metaweb/gridworks/gel/controls/IsBlank.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/IsBlank.java
rename to main/src/com/metaweb/gridworks/gel/controls/IsBlank.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/IsError.java b/main/src/com/metaweb/gridworks/gel/controls/IsError.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/IsError.java
rename to main/src/com/metaweb/gridworks/gel/controls/IsError.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/IsNonBlank.java b/main/src/com/metaweb/gridworks/gel/controls/IsNonBlank.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/IsNonBlank.java
rename to main/src/com/metaweb/gridworks/gel/controls/IsNonBlank.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/IsNotNull.java b/main/src/com/metaweb/gridworks/gel/controls/IsNotNull.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/IsNotNull.java
rename to main/src/com/metaweb/gridworks/gel/controls/IsNotNull.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/IsNull.java b/main/src/com/metaweb/gridworks/gel/controls/IsNull.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/IsNull.java
rename to main/src/com/metaweb/gridworks/gel/controls/IsNull.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/IsNumeric.java b/main/src/com/metaweb/gridworks/gel/controls/IsNumeric.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/IsNumeric.java
rename to main/src/com/metaweb/gridworks/gel/controls/IsNumeric.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/IsTest.java b/main/src/com/metaweb/gridworks/gel/controls/IsTest.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/IsTest.java
rename to main/src/com/metaweb/gridworks/gel/controls/IsTest.java
diff --git a/main/java/com/metaweb/gridworks/gel/controls/With.java b/main/src/com/metaweb/gridworks/gel/controls/With.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/gel/controls/With.java
rename to main/src/com/metaweb/gridworks/gel/controls/With.java
diff --git a/main/java/com/metaweb/gridworks/history/Change.java b/main/src/com/metaweb/gridworks/history/Change.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/history/Change.java
rename to main/src/com/metaweb/gridworks/history/Change.java
diff --git a/main/java/com/metaweb/gridworks/history/ChangeSequence.java b/main/src/com/metaweb/gridworks/history/ChangeSequence.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/history/ChangeSequence.java
rename to main/src/com/metaweb/gridworks/history/ChangeSequence.java
diff --git a/main/java/com/metaweb/gridworks/history/History.java b/main/src/com/metaweb/gridworks/history/History.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/history/History.java
rename to main/src/com/metaweb/gridworks/history/History.java
diff --git a/main/java/com/metaweb/gridworks/history/HistoryEntry.java b/main/src/com/metaweb/gridworks/history/HistoryEntry.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/history/HistoryEntry.java
rename to main/src/com/metaweb/gridworks/history/HistoryEntry.java
diff --git a/main/java/com/metaweb/gridworks/history/HistoryProcess.java b/main/src/com/metaweb/gridworks/history/HistoryProcess.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/history/HistoryProcess.java
rename to main/src/com/metaweb/gridworks/history/HistoryProcess.java
diff --git a/main/java/com/metaweb/gridworks/importers/ExcelImporter.java b/main/src/com/metaweb/gridworks/importers/ExcelImporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/ExcelImporter.java
rename to main/src/com/metaweb/gridworks/importers/ExcelImporter.java
diff --git a/main/java/com/metaweb/gridworks/importers/Importer.java b/main/src/com/metaweb/gridworks/importers/Importer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/Importer.java
rename to main/src/com/metaweb/gridworks/importers/Importer.java
diff --git a/main/java/com/metaweb/gridworks/importers/ImporterUtilities.java b/main/src/com/metaweb/gridworks/importers/ImporterUtilities.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/ImporterUtilities.java
rename to main/src/com/metaweb/gridworks/importers/ImporterUtilities.java
diff --git a/main/java/com/metaweb/gridworks/importers/MarcImporter.java b/main/src/com/metaweb/gridworks/importers/MarcImporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/MarcImporter.java
rename to main/src/com/metaweb/gridworks/importers/MarcImporter.java
diff --git a/main/java/com/metaweb/gridworks/importers/RdfTripleImporter.java b/main/src/com/metaweb/gridworks/importers/RdfTripleImporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/RdfTripleImporter.java
rename to main/src/com/metaweb/gridworks/importers/RdfTripleImporter.java
diff --git a/main/java/com/metaweb/gridworks/importers/TsvCsvImporter.java b/main/src/com/metaweb/gridworks/importers/TsvCsvImporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/TsvCsvImporter.java
rename to main/src/com/metaweb/gridworks/importers/TsvCsvImporter.java
diff --git a/main/java/com/metaweb/gridworks/importers/XmlImportUtilities.java b/main/src/com/metaweb/gridworks/importers/XmlImportUtilities.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/XmlImportUtilities.java
rename to main/src/com/metaweb/gridworks/importers/XmlImportUtilities.java
diff --git a/main/java/com/metaweb/gridworks/importers/XmlImporter.java b/main/src/com/metaweb/gridworks/importers/XmlImporter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/XmlImporter.java
rename to main/src/com/metaweb/gridworks/importers/XmlImporter.java
diff --git a/main/java/com/metaweb/gridworks/importers/parsers/NonSplitRowParser.java b/main/src/com/metaweb/gridworks/importers/parsers/NonSplitRowParser.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/parsers/NonSplitRowParser.java
rename to main/src/com/metaweb/gridworks/importers/parsers/NonSplitRowParser.java
diff --git a/main/java/com/metaweb/gridworks/importers/parsers/RowParser.java b/main/src/com/metaweb/gridworks/importers/parsers/RowParser.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/parsers/RowParser.java
rename to main/src/com/metaweb/gridworks/importers/parsers/RowParser.java
diff --git a/main/java/com/metaweb/gridworks/importers/parsers/SeparatorRowParser.java b/main/src/com/metaweb/gridworks/importers/parsers/SeparatorRowParser.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/importers/parsers/SeparatorRowParser.java
rename to main/src/com/metaweb/gridworks/importers/parsers/SeparatorRowParser.java
diff --git a/main/java/com/metaweb/gridworks/model/AbstractOperation.java b/main/src/com/metaweb/gridworks/model/AbstractOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/AbstractOperation.java
rename to main/src/com/metaweb/gridworks/model/AbstractOperation.java
diff --git a/main/java/com/metaweb/gridworks/model/Cell.java b/main/src/com/metaweb/gridworks/model/Cell.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/Cell.java
rename to main/src/com/metaweb/gridworks/model/Cell.java
diff --git a/main/java/com/metaweb/gridworks/model/Column.java b/main/src/com/metaweb/gridworks/model/Column.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/Column.java
rename to main/src/com/metaweb/gridworks/model/Column.java
diff --git a/main/java/com/metaweb/gridworks/model/ColumnGroup.java b/main/src/com/metaweb/gridworks/model/ColumnGroup.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/ColumnGroup.java
rename to main/src/com/metaweb/gridworks/model/ColumnGroup.java
diff --git a/main/java/com/metaweb/gridworks/model/ColumnModel.java b/main/src/com/metaweb/gridworks/model/ColumnModel.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/ColumnModel.java
rename to main/src/com/metaweb/gridworks/model/ColumnModel.java
diff --git a/main/java/com/metaweb/gridworks/model/ModelException.java b/main/src/com/metaweb/gridworks/model/ModelException.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/ModelException.java
rename to main/src/com/metaweb/gridworks/model/ModelException.java
diff --git a/main/java/com/metaweb/gridworks/model/Project.java b/main/src/com/metaweb/gridworks/model/Project.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/Project.java
rename to main/src/com/metaweb/gridworks/model/Project.java
diff --git a/main/java/com/metaweb/gridworks/model/Recon.java b/main/src/com/metaweb/gridworks/model/Recon.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/Recon.java
rename to main/src/com/metaweb/gridworks/model/Recon.java
diff --git a/main/java/com/metaweb/gridworks/model/ReconCandidate.java b/main/src/com/metaweb/gridworks/model/ReconCandidate.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/ReconCandidate.java
rename to main/src/com/metaweb/gridworks/model/ReconCandidate.java
diff --git a/main/java/com/metaweb/gridworks/model/ReconStats.java b/main/src/com/metaweb/gridworks/model/ReconStats.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/ReconStats.java
rename to main/src/com/metaweb/gridworks/model/ReconStats.java
diff --git a/main/java/com/metaweb/gridworks/model/Record.java b/main/src/com/metaweb/gridworks/model/Record.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/Record.java
rename to main/src/com/metaweb/gridworks/model/Record.java
diff --git a/main/java/com/metaweb/gridworks/model/RecordModel.java b/main/src/com/metaweb/gridworks/model/RecordModel.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/RecordModel.java
rename to main/src/com/metaweb/gridworks/model/RecordModel.java
diff --git a/main/java/com/metaweb/gridworks/model/Row.java b/main/src/com/metaweb/gridworks/model/Row.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/Row.java
rename to main/src/com/metaweb/gridworks/model/Row.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/CellAtRow.java b/main/src/com/metaweb/gridworks/model/changes/CellAtRow.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/CellAtRow.java
rename to main/src/com/metaweb/gridworks/model/changes/CellAtRow.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/CellChange.java b/main/src/com/metaweb/gridworks/model/changes/CellChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/CellChange.java
rename to main/src/com/metaweb/gridworks/model/changes/CellChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/ColumnAdditionChange.java b/main/src/com/metaweb/gridworks/model/changes/ColumnAdditionChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/ColumnAdditionChange.java
rename to main/src/com/metaweb/gridworks/model/changes/ColumnAdditionChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/ColumnChange.java b/main/src/com/metaweb/gridworks/model/changes/ColumnChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/ColumnChange.java
rename to main/src/com/metaweb/gridworks/model/changes/ColumnChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/ColumnRemovalChange.java b/main/src/com/metaweb/gridworks/model/changes/ColumnRemovalChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/ColumnRemovalChange.java
rename to main/src/com/metaweb/gridworks/model/changes/ColumnRemovalChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/ColumnRenameChange.java b/main/src/com/metaweb/gridworks/model/changes/ColumnRenameChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/ColumnRenameChange.java
rename to main/src/com/metaweb/gridworks/model/changes/ColumnRenameChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/ColumnSplitChange.java b/main/src/com/metaweb/gridworks/model/changes/ColumnSplitChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/ColumnSplitChange.java
rename to main/src/com/metaweb/gridworks/model/changes/ColumnSplitChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/DataExtensionChange.java b/main/src/com/metaweb/gridworks/model/changes/DataExtensionChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/DataExtensionChange.java
rename to main/src/com/metaweb/gridworks/model/changes/DataExtensionChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/MassCellChange.java b/main/src/com/metaweb/gridworks/model/changes/MassCellChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/MassCellChange.java
rename to main/src/com/metaweb/gridworks/model/changes/MassCellChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/MassChange.java b/main/src/com/metaweb/gridworks/model/changes/MassChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/MassChange.java
rename to main/src/com/metaweb/gridworks/model/changes/MassChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/MassRowChange.java b/main/src/com/metaweb/gridworks/model/changes/MassRowChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/MassRowChange.java
rename to main/src/com/metaweb/gridworks/model/changes/MassRowChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/ReconChange.java b/main/src/com/metaweb/gridworks/model/changes/ReconChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/ReconChange.java
rename to main/src/com/metaweb/gridworks/model/changes/ReconChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/RowFlagChange.java b/main/src/com/metaweb/gridworks/model/changes/RowFlagChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/RowFlagChange.java
rename to main/src/com/metaweb/gridworks/model/changes/RowFlagChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/RowRemovalChange.java b/main/src/com/metaweb/gridworks/model/changes/RowRemovalChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/RowRemovalChange.java
rename to main/src/com/metaweb/gridworks/model/changes/RowRemovalChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/RowReorderChange.java b/main/src/com/metaweb/gridworks/model/changes/RowReorderChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/RowReorderChange.java
rename to main/src/com/metaweb/gridworks/model/changes/RowReorderChange.java
diff --git a/main/java/com/metaweb/gridworks/model/changes/RowStarChange.java b/main/src/com/metaweb/gridworks/model/changes/RowStarChange.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/changes/RowStarChange.java
rename to main/src/com/metaweb/gridworks/model/changes/RowStarChange.java
diff --git a/main/java/com/metaweb/gridworks/model/recon/DataExtensionReconConfig.java b/main/src/com/metaweb/gridworks/model/recon/DataExtensionReconConfig.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/recon/DataExtensionReconConfig.java
rename to main/src/com/metaweb/gridworks/model/recon/DataExtensionReconConfig.java
diff --git a/main/java/com/metaweb/gridworks/model/recon/GuidBasedReconConfig.java b/main/src/com/metaweb/gridworks/model/recon/GuidBasedReconConfig.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/recon/GuidBasedReconConfig.java
rename to main/src/com/metaweb/gridworks/model/recon/GuidBasedReconConfig.java
diff --git a/main/java/com/metaweb/gridworks/model/recon/HeuristicReconConfig.java b/main/src/com/metaweb/gridworks/model/recon/HeuristicReconConfig.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/recon/HeuristicReconConfig.java
rename to main/src/com/metaweb/gridworks/model/recon/HeuristicReconConfig.java
diff --git a/main/java/com/metaweb/gridworks/model/recon/IdBasedReconConfig.java b/main/src/com/metaweb/gridworks/model/recon/IdBasedReconConfig.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/recon/IdBasedReconConfig.java
rename to main/src/com/metaweb/gridworks/model/recon/IdBasedReconConfig.java
diff --git a/main/java/com/metaweb/gridworks/model/recon/KeyBasedReconConfig.java b/main/src/com/metaweb/gridworks/model/recon/KeyBasedReconConfig.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/recon/KeyBasedReconConfig.java
rename to main/src/com/metaweb/gridworks/model/recon/KeyBasedReconConfig.java
diff --git a/main/java/com/metaweb/gridworks/model/recon/ReconConfig.java b/main/src/com/metaweb/gridworks/model/recon/ReconConfig.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/recon/ReconConfig.java
rename to main/src/com/metaweb/gridworks/model/recon/ReconConfig.java
diff --git a/main/java/com/metaweb/gridworks/model/recon/ReconJob.java b/main/src/com/metaweb/gridworks/model/recon/ReconJob.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/recon/ReconJob.java
rename to main/src/com/metaweb/gridworks/model/recon/ReconJob.java
diff --git a/main/java/com/metaweb/gridworks/model/recon/StrictReconConfig.java b/main/src/com/metaweb/gridworks/model/recon/StrictReconConfig.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/model/recon/StrictReconConfig.java
rename to main/src/com/metaweb/gridworks/model/recon/StrictReconConfig.java
diff --git a/main/java/com/metaweb/gridworks/oauth/Credentials.java b/main/src/com/metaweb/gridworks/oauth/Credentials.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/oauth/Credentials.java
rename to main/src/com/metaweb/gridworks/oauth/Credentials.java
diff --git a/main/java/com/metaweb/gridworks/oauth/FreebaseProvider.java b/main/src/com/metaweb/gridworks/oauth/FreebaseProvider.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/oauth/FreebaseProvider.java
rename to main/src/com/metaweb/gridworks/oauth/FreebaseProvider.java
diff --git a/main/java/com/metaweb/gridworks/oauth/FreebaseTimeCommonsHttpOAuthConsumer.java b/main/src/com/metaweb/gridworks/oauth/FreebaseTimeCommonsHttpOAuthConsumer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/oauth/FreebaseTimeCommonsHttpOAuthConsumer.java
rename to main/src/com/metaweb/gridworks/oauth/FreebaseTimeCommonsHttpOAuthConsumer.java
diff --git a/main/java/com/metaweb/gridworks/oauth/OAuthUtilities.java b/main/src/com/metaweb/gridworks/oauth/OAuthUtilities.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/oauth/OAuthUtilities.java
rename to main/src/com/metaweb/gridworks/oauth/OAuthUtilities.java
diff --git a/main/java/com/metaweb/gridworks/oauth/Provider.java b/main/src/com/metaweb/gridworks/oauth/Provider.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/oauth/Provider.java
rename to main/src/com/metaweb/gridworks/oauth/Provider.java
diff --git a/main/java/com/metaweb/gridworks/operations/EngineDependentMassCellOperation.java b/main/src/com/metaweb/gridworks/operations/EngineDependentMassCellOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/EngineDependentMassCellOperation.java
rename to main/src/com/metaweb/gridworks/operations/EngineDependentMassCellOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/EngineDependentOperation.java b/main/src/com/metaweb/gridworks/operations/EngineDependentOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/EngineDependentOperation.java
rename to main/src/com/metaweb/gridworks/operations/EngineDependentOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/OnError.java b/main/src/com/metaweb/gridworks/operations/OnError.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/OnError.java
rename to main/src/com/metaweb/gridworks/operations/OnError.java
diff --git a/main/java/com/metaweb/gridworks/operations/OperationRegistry.java b/main/src/com/metaweb/gridworks/operations/OperationRegistry.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/OperationRegistry.java
rename to main/src/com/metaweb/gridworks/operations/OperationRegistry.java
diff --git a/main/java/com/metaweb/gridworks/operations/SaveProtographOperation.java b/main/src/com/metaweb/gridworks/operations/SaveProtographOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/SaveProtographOperation.java
rename to main/src/com/metaweb/gridworks/operations/SaveProtographOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/cell/MassEditOperation.java b/main/src/com/metaweb/gridworks/operations/cell/MassEditOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/cell/MassEditOperation.java
rename to main/src/com/metaweb/gridworks/operations/cell/MassEditOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellJoinOperation.java b/main/src/com/metaweb/gridworks/operations/cell/MultiValuedCellJoinOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellJoinOperation.java
rename to main/src/com/metaweb/gridworks/operations/cell/MultiValuedCellJoinOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellSplitOperation.java b/main/src/com/metaweb/gridworks/operations/cell/MultiValuedCellSplitOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellSplitOperation.java
rename to main/src/com/metaweb/gridworks/operations/cell/MultiValuedCellSplitOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/cell/TextTransformOperation.java b/main/src/com/metaweb/gridworks/operations/cell/TextTransformOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/cell/TextTransformOperation.java
rename to main/src/com/metaweb/gridworks/operations/cell/TextTransformOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/column/ColumnAdditionOperation.java b/main/src/com/metaweb/gridworks/operations/column/ColumnAdditionOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/column/ColumnAdditionOperation.java
rename to main/src/com/metaweb/gridworks/operations/column/ColumnAdditionOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/column/ColumnRemovalOperation.java b/main/src/com/metaweb/gridworks/operations/column/ColumnRemovalOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/column/ColumnRemovalOperation.java
rename to main/src/com/metaweb/gridworks/operations/column/ColumnRemovalOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/column/ColumnRenameOperation.java b/main/src/com/metaweb/gridworks/operations/column/ColumnRenameOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/column/ColumnRenameOperation.java
rename to main/src/com/metaweb/gridworks/operations/column/ColumnRenameOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/column/ColumnSplitOperation.java b/main/src/com/metaweb/gridworks/operations/column/ColumnSplitOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/column/ColumnSplitOperation.java
rename to main/src/com/metaweb/gridworks/operations/column/ColumnSplitOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/column/ExtendDataOperation.java b/main/src/com/metaweb/gridworks/operations/column/ExtendDataOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/column/ExtendDataOperation.java
rename to main/src/com/metaweb/gridworks/operations/column/ExtendDataOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/recon/ReconDiscardJudgmentsOperation.java b/main/src/com/metaweb/gridworks/operations/recon/ReconDiscardJudgmentsOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/recon/ReconDiscardJudgmentsOperation.java
rename to main/src/com/metaweb/gridworks/operations/recon/ReconDiscardJudgmentsOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/recon/ReconJudgeSimilarCellsOperation.java b/main/src/com/metaweb/gridworks/operations/recon/ReconJudgeSimilarCellsOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/recon/ReconJudgeSimilarCellsOperation.java
rename to main/src/com/metaweb/gridworks/operations/recon/ReconJudgeSimilarCellsOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/recon/ReconMarkNewTopicsOperation.java b/main/src/com/metaweb/gridworks/operations/recon/ReconMarkNewTopicsOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/recon/ReconMarkNewTopicsOperation.java
rename to main/src/com/metaweb/gridworks/operations/recon/ReconMarkNewTopicsOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/recon/ReconMatchBestCandidatesOperation.java b/main/src/com/metaweb/gridworks/operations/recon/ReconMatchBestCandidatesOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/recon/ReconMatchBestCandidatesOperation.java
rename to main/src/com/metaweb/gridworks/operations/recon/ReconMatchBestCandidatesOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/recon/ReconMatchSpecificTopicOperation.java b/main/src/com/metaweb/gridworks/operations/recon/ReconMatchSpecificTopicOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/recon/ReconMatchSpecificTopicOperation.java
rename to main/src/com/metaweb/gridworks/operations/recon/ReconMatchSpecificTopicOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/recon/ReconOperation.java b/main/src/com/metaweb/gridworks/operations/recon/ReconOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/recon/ReconOperation.java
rename to main/src/com/metaweb/gridworks/operations/recon/ReconOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/row/DenormalizeOperation.java b/main/src/com/metaweb/gridworks/operations/row/DenormalizeOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/row/DenormalizeOperation.java
rename to main/src/com/metaweb/gridworks/operations/row/DenormalizeOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/row/RowFlagOperation.java b/main/src/com/metaweb/gridworks/operations/row/RowFlagOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/row/RowFlagOperation.java
rename to main/src/com/metaweb/gridworks/operations/row/RowFlagOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/row/RowRemovalOperation.java b/main/src/com/metaweb/gridworks/operations/row/RowRemovalOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/row/RowRemovalOperation.java
rename to main/src/com/metaweb/gridworks/operations/row/RowRemovalOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/row/RowReorderOperation.java b/main/src/com/metaweb/gridworks/operations/row/RowReorderOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/row/RowReorderOperation.java
rename to main/src/com/metaweb/gridworks/operations/row/RowReorderOperation.java
diff --git a/main/java/com/metaweb/gridworks/operations/row/RowStarOperation.java b/main/src/com/metaweb/gridworks/operations/row/RowStarOperation.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/operations/row/RowStarOperation.java
rename to main/src/com/metaweb/gridworks/operations/row/RowStarOperation.java
diff --git a/main/java/com/metaweb/gridworks/process/LongRunningProcess.java b/main/src/com/metaweb/gridworks/process/LongRunningProcess.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/process/LongRunningProcess.java
rename to main/src/com/metaweb/gridworks/process/LongRunningProcess.java
diff --git a/main/java/com/metaweb/gridworks/process/Process.java b/main/src/com/metaweb/gridworks/process/Process.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/process/Process.java
rename to main/src/com/metaweb/gridworks/process/Process.java
diff --git a/main/java/com/metaweb/gridworks/process/ProcessManager.java b/main/src/com/metaweb/gridworks/process/ProcessManager.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/process/ProcessManager.java
rename to main/src/com/metaweb/gridworks/process/ProcessManager.java
diff --git a/main/java/com/metaweb/gridworks/process/QuickHistoryEntryProcess.java b/main/src/com/metaweb/gridworks/process/QuickHistoryEntryProcess.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/process/QuickHistoryEntryProcess.java
rename to main/src/com/metaweb/gridworks/process/QuickHistoryEntryProcess.java
diff --git a/main/java/com/metaweb/gridworks/protograph/AnonymousNode.java b/main/src/com/metaweb/gridworks/protograph/AnonymousNode.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/AnonymousNode.java
rename to main/src/com/metaweb/gridworks/protograph/AnonymousNode.java
diff --git a/main/java/com/metaweb/gridworks/protograph/CellKeyNode.java b/main/src/com/metaweb/gridworks/protograph/CellKeyNode.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/CellKeyNode.java
rename to main/src/com/metaweb/gridworks/protograph/CellKeyNode.java
diff --git a/main/java/com/metaweb/gridworks/protograph/CellNode.java b/main/src/com/metaweb/gridworks/protograph/CellNode.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/CellNode.java
rename to main/src/com/metaweb/gridworks/protograph/CellNode.java
diff --git a/main/java/com/metaweb/gridworks/protograph/CellTopicNode.java b/main/src/com/metaweb/gridworks/protograph/CellTopicNode.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/CellTopicNode.java
rename to main/src/com/metaweb/gridworks/protograph/CellTopicNode.java
diff --git a/main/java/com/metaweb/gridworks/protograph/CellValueNode.java b/main/src/com/metaweb/gridworks/protograph/CellValueNode.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/CellValueNode.java
rename to main/src/com/metaweb/gridworks/protograph/CellValueNode.java
diff --git a/main/java/com/metaweb/gridworks/protograph/FreebaseProperty.java b/main/src/com/metaweb/gridworks/protograph/FreebaseProperty.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/FreebaseProperty.java
rename to main/src/com/metaweb/gridworks/protograph/FreebaseProperty.java
diff --git a/main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java b/main/src/com/metaweb/gridworks/protograph/FreebaseTopic.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java
rename to main/src/com/metaweb/gridworks/protograph/FreebaseTopic.java
diff --git a/main/java/com/metaweb/gridworks/protograph/FreebaseTopicNode.java b/main/src/com/metaweb/gridworks/protograph/FreebaseTopicNode.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/FreebaseTopicNode.java
rename to main/src/com/metaweb/gridworks/protograph/FreebaseTopicNode.java
diff --git a/main/java/com/metaweb/gridworks/protograph/FreebaseType.java b/main/src/com/metaweb/gridworks/protograph/FreebaseType.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/FreebaseType.java
rename to main/src/com/metaweb/gridworks/protograph/FreebaseType.java
diff --git a/main/java/com/metaweb/gridworks/protograph/Link.java b/main/src/com/metaweb/gridworks/protograph/Link.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/Link.java
rename to main/src/com/metaweb/gridworks/protograph/Link.java
diff --git a/main/java/com/metaweb/gridworks/protograph/Node.java b/main/src/com/metaweb/gridworks/protograph/Node.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/Node.java
rename to main/src/com/metaweb/gridworks/protograph/Node.java
diff --git a/main/java/com/metaweb/gridworks/protograph/NodeWithLinks.java b/main/src/com/metaweb/gridworks/protograph/NodeWithLinks.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/NodeWithLinks.java
rename to main/src/com/metaweb/gridworks/protograph/NodeWithLinks.java
diff --git a/main/java/com/metaweb/gridworks/protograph/Protograph.java b/main/src/com/metaweb/gridworks/protograph/Protograph.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/Protograph.java
rename to main/src/com/metaweb/gridworks/protograph/Protograph.java
diff --git a/main/java/com/metaweb/gridworks/protograph/ValueNode.java b/main/src/com/metaweb/gridworks/protograph/ValueNode.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/ValueNode.java
rename to main/src/com/metaweb/gridworks/protograph/ValueNode.java
diff --git a/main/java/com/metaweb/gridworks/protograph/transpose/MqlwriteLikeTransposedNodeFactory.java b/main/src/com/metaweb/gridworks/protograph/transpose/MqlwriteLikeTransposedNodeFactory.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/transpose/MqlwriteLikeTransposedNodeFactory.java
rename to main/src/com/metaweb/gridworks/protograph/transpose/MqlwriteLikeTransposedNodeFactory.java
diff --git a/main/java/com/metaweb/gridworks/protograph/transpose/TransposedNode.java b/main/src/com/metaweb/gridworks/protograph/transpose/TransposedNode.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/transpose/TransposedNode.java
rename to main/src/com/metaweb/gridworks/protograph/transpose/TransposedNode.java
diff --git a/main/java/com/metaweb/gridworks/protograph/transpose/TransposedNodeFactory.java b/main/src/com/metaweb/gridworks/protograph/transpose/TransposedNodeFactory.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/transpose/TransposedNodeFactory.java
rename to main/src/com/metaweb/gridworks/protograph/transpose/TransposedNodeFactory.java
diff --git a/main/java/com/metaweb/gridworks/protograph/transpose/Transposer.java b/main/src/com/metaweb/gridworks/protograph/transpose/Transposer.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/transpose/Transposer.java
rename to main/src/com/metaweb/gridworks/protograph/transpose/Transposer.java
diff --git a/main/java/com/metaweb/gridworks/protograph/transpose/TripleLoaderTransposedNodeFactory.java b/main/src/com/metaweb/gridworks/protograph/transpose/TripleLoaderTransposedNodeFactory.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/protograph/transpose/TripleLoaderTransposedNodeFactory.java
rename to main/src/com/metaweb/gridworks/protograph/transpose/TripleLoaderTransposedNodeFactory.java
diff --git a/main/java/com/metaweb/gridworks/sorting/BaseSorter.java b/main/src/com/metaweb/gridworks/sorting/BaseSorter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/sorting/BaseSorter.java
rename to main/src/com/metaweb/gridworks/sorting/BaseSorter.java
diff --git a/main/java/com/metaweb/gridworks/sorting/BooleanCriterion.java b/main/src/com/metaweb/gridworks/sorting/BooleanCriterion.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/sorting/BooleanCriterion.java
rename to main/src/com/metaweb/gridworks/sorting/BooleanCriterion.java
diff --git a/main/java/com/metaweb/gridworks/sorting/Criterion.java b/main/src/com/metaweb/gridworks/sorting/Criterion.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/sorting/Criterion.java
rename to main/src/com/metaweb/gridworks/sorting/Criterion.java
diff --git a/main/java/com/metaweb/gridworks/sorting/DateCriterion.java b/main/src/com/metaweb/gridworks/sorting/DateCriterion.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/sorting/DateCriterion.java
rename to main/src/com/metaweb/gridworks/sorting/DateCriterion.java
diff --git a/main/java/com/metaweb/gridworks/sorting/NumberCriterion.java b/main/src/com/metaweb/gridworks/sorting/NumberCriterion.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/sorting/NumberCriterion.java
rename to main/src/com/metaweb/gridworks/sorting/NumberCriterion.java
diff --git a/main/java/com/metaweb/gridworks/sorting/SortingRecordVisitor.java b/main/src/com/metaweb/gridworks/sorting/SortingRecordVisitor.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/sorting/SortingRecordVisitor.java
rename to main/src/com/metaweb/gridworks/sorting/SortingRecordVisitor.java
diff --git a/main/java/com/metaweb/gridworks/sorting/SortingRowVisitor.java b/main/src/com/metaweb/gridworks/sorting/SortingRowVisitor.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/sorting/SortingRowVisitor.java
rename to main/src/com/metaweb/gridworks/sorting/SortingRowVisitor.java
diff --git a/main/java/com/metaweb/gridworks/sorting/StringCriterion.java b/main/src/com/metaweb/gridworks/sorting/StringCriterion.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/sorting/StringCriterion.java
rename to main/src/com/metaweb/gridworks/sorting/StringCriterion.java
diff --git a/main/java/com/metaweb/gridworks/templating/DynamicFragment.java b/main/src/com/metaweb/gridworks/templating/DynamicFragment.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/templating/DynamicFragment.java
rename to main/src/com/metaweb/gridworks/templating/DynamicFragment.java
diff --git a/main/java/com/metaweb/gridworks/templating/Fragment.java b/main/src/com/metaweb/gridworks/templating/Fragment.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/templating/Fragment.java
rename to main/src/com/metaweb/gridworks/templating/Fragment.java
diff --git a/main/java/com/metaweb/gridworks/templating/Parser.java b/main/src/com/metaweb/gridworks/templating/Parser.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/templating/Parser.java
rename to main/src/com/metaweb/gridworks/templating/Parser.java
diff --git a/main/java/com/metaweb/gridworks/templating/StaticFragment.java b/main/src/com/metaweb/gridworks/templating/StaticFragment.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/templating/StaticFragment.java
rename to main/src/com/metaweb/gridworks/templating/StaticFragment.java
diff --git a/main/java/com/metaweb/gridworks/templating/Template.java b/main/src/com/metaweb/gridworks/templating/Template.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/templating/Template.java
rename to main/src/com/metaweb/gridworks/templating/Template.java
diff --git a/main/java/com/metaweb/gridworks/util/CookiesUtilities.java b/main/src/com/metaweb/gridworks/util/CookiesUtilities.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/util/CookiesUtilities.java
rename to main/src/com/metaweb/gridworks/util/CookiesUtilities.java
diff --git a/main/java/com/metaweb/gridworks/util/FreebaseDataExtensionJob.java b/main/src/com/metaweb/gridworks/util/FreebaseDataExtensionJob.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/util/FreebaseDataExtensionJob.java
rename to main/src/com/metaweb/gridworks/util/FreebaseDataExtensionJob.java
diff --git a/main/java/com/metaweb/gridworks/util/FreebaseUtils.java b/main/src/com/metaweb/gridworks/util/FreebaseUtils.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/util/FreebaseUtils.java
rename to main/src/com/metaweb/gridworks/util/FreebaseUtils.java
diff --git a/main/java/com/metaweb/gridworks/util/IOUtils.java b/main/src/com/metaweb/gridworks/util/IOUtils.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/util/IOUtils.java
rename to main/src/com/metaweb/gridworks/util/IOUtils.java
diff --git a/main/java/com/metaweb/gridworks/util/IndentWriter.java b/main/src/com/metaweb/gridworks/util/IndentWriter.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/util/IndentWriter.java
rename to main/src/com/metaweb/gridworks/util/IndentWriter.java
diff --git a/main/java/com/metaweb/gridworks/util/JSONUtilities.java b/main/src/com/metaweb/gridworks/util/JSONUtilities.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/util/JSONUtilities.java
rename to main/src/com/metaweb/gridworks/util/JSONUtilities.java
diff --git a/main/java/com/metaweb/gridworks/util/JSObject.java b/main/src/com/metaweb/gridworks/util/JSObject.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/util/JSObject.java
rename to main/src/com/metaweb/gridworks/util/JSObject.java
diff --git a/main/java/com/metaweb/gridworks/util/ParsingUtilities.java b/main/src/com/metaweb/gridworks/util/ParsingUtilities.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/util/ParsingUtilities.java
rename to main/src/com/metaweb/gridworks/util/ParsingUtilities.java
diff --git a/main/java/com/metaweb/gridworks/util/Pool.java b/main/src/com/metaweb/gridworks/util/Pool.java
similarity index 100%
rename from main/java/com/metaweb/gridworks/util/Pool.java
rename to main/src/com/metaweb/gridworks/util/Pool.java
diff --git a/tests/data/Wpi Data.tsv b/main/tests/data/Wpi Data.tsv
similarity index 100%
rename from tests/data/Wpi Data.tsv
rename to main/tests/data/Wpi Data.tsv
diff --git a/tests/data/birds.csv b/main/tests/data/birds.csv
similarity index 100%
rename from tests/data/birds.csv
rename to main/tests/data/birds.csv
diff --git a/tests/data/example-latin1.tsv b/main/tests/data/example-latin1.tsv
similarity index 100%
rename from tests/data/example-latin1.tsv
rename to main/tests/data/example-latin1.tsv
diff --git a/tests/data/example-linebreaks-in-cells.csv b/main/tests/data/example-linebreaks-in-cells.csv
similarity index 100%
rename from tests/data/example-linebreaks-in-cells.csv
rename to main/tests/data/example-linebreaks-in-cells.csv
diff --git a/tests/data/example-linebreaks-in-cells.tsv b/main/tests/data/example-linebreaks-in-cells.tsv
similarity index 100%
rename from tests/data/example-linebreaks-in-cells.tsv
rename to main/tests/data/example-linebreaks-in-cells.tsv
diff --git a/tests/data/example-utf8.tsv b/main/tests/data/example-utf8.tsv
similarity index 100%
rename from tests/data/example-utf8.tsv
rename to main/tests/data/example-utf8.tsv
diff --git a/tests/data/food.csv b/main/tests/data/food.csv
similarity index 100%
rename from tests/data/food.csv
rename to main/tests/data/food.csv
diff --git a/tests/data/food.small.csv b/main/tests/data/food.small.csv
similarity index 100%
rename from tests/data/food.small.csv
rename to main/tests/data/food.small.csv
diff --git a/tests/data/government_contracts.csv b/main/tests/data/government_contracts.csv
similarity index 100%
rename from tests/data/government_contracts.csv
rename to main/tests/data/government_contracts.csv
diff --git a/tests/data/movies-condensed.tsv b/main/tests/data/movies-condensed.tsv
similarity index 100%
rename from tests/data/movies-condensed.tsv
rename to main/tests/data/movies-condensed.tsv
diff --git a/tests/data/movies.tsv b/main/tests/data/movies.tsv
similarity index 100%
rename from tests/data/movies.tsv
rename to main/tests/data/movies.tsv
diff --git a/tests/data/nobel-prize-winners.csv b/main/tests/data/nobel-prize-winners.csv
similarity index 100%
rename from tests/data/nobel-prize-winners.csv
rename to main/tests/data/nobel-prize-winners.csv
diff --git a/tests/data/ozone_8hr_dmax.csv b/main/tests/data/ozone_8hr_dmax.csv
similarity index 100%
rename from tests/data/ozone_8hr_dmax.csv
rename to main/tests/data/ozone_8hr_dmax.csv
diff --git a/tests/data/ozone_sites.csv b/main/tests/data/ozone_sites.csv
similarity index 100%
rename from tests/data/ozone_sites.csv
rename to main/tests/data/ozone_sites.csv
diff --git a/tests/data/presidents.tsv b/main/tests/data/presidents.tsv
similarity index 100%
rename from tests/data/presidents.tsv
rename to main/tests/data/presidents.tsv
diff --git a/tests/java/conf/tests.xml b/main/tests/java/conf/tests.xml
similarity index 100%
rename from tests/java/conf/tests.xml
rename to main/tests/java/conf/tests.xml
diff --git a/tests/java/lib-src/mockito-all-1.8.4-sources.jar b/main/tests/java/lib-src/mockito-all-1.8.4-sources.jar
similarity index 100%
rename from tests/java/lib-src/mockito-all-1.8.4-sources.jar
rename to main/tests/java/lib-src/mockito-all-1.8.4-sources.jar
diff --git a/tests/java/lib-src/testng-5.12.1-sources.jar b/main/tests/java/lib-src/testng-5.12.1-sources.jar
similarity index 100%
rename from tests/java/lib-src/testng-5.12.1-sources.jar
rename to main/tests/java/lib-src/testng-5.12.1-sources.jar
diff --git a/tests/java/lib/mockito-all-1.8.4.jar b/main/tests/java/lib/mockito-all-1.8.4.jar
similarity index 100%
rename from tests/java/lib/mockito-all-1.8.4.jar
rename to main/tests/java/lib/mockito-all-1.8.4.jar
diff --git a/tests/java/lib/testng-5.12.1.jar b/main/tests/java/lib/testng-5.12.1.jar
similarity index 100%
rename from tests/java/lib/testng-5.12.1.jar
rename to main/tests/java/lib/testng-5.12.1.jar
diff --git a/tests/java/src/com/metaweb/gridworks/tests/GridworksServletStub.java b/main/tests/java/src/com/metaweb/gridworks/tests/GridworksServletStub.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/GridworksServletStub.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/GridworksServletStub.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/GridworksServletTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/GridworksServletTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/GridworksServletTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/GridworksServletTests.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/commands/CommandStub.java b/main/tests/java/src/com/metaweb/gridworks/tests/commands/CommandStub.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/commands/CommandStub.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/commands/CommandStub.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/commands/CommandTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/commands/CommandTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/commands/CommandTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/commands/CommandTests.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/commands/util/CancelProcessesCommandTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/commands/util/CancelProcessesCommandTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/commands/util/CancelProcessesCommandTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/commands/util/CancelProcessesCommandTests.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/importers/ImporterUtilitiesTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/importers/ImporterUtilitiesTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/importers/ImporterUtilitiesTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/importers/ImporterUtilitiesTests.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/importers/RdfTripleImporterTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/importers/RdfTripleImporterTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/importers/RdfTripleImporterTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/importers/RdfTripleImporterTests.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/importers/TsvCsvImporterTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/importers/TsvCsvImporterTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/importers/TsvCsvImporterTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/importers/TsvCsvImporterTests.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/importers/XmlImporterTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/importers/XmlImporterTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/importers/XmlImporterTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/importers/XmlImporterTests.java
diff --git a/tests/java/src/com/metaweb/gridworks/tests/util/ParsingUtilitiesTests.java b/main/tests/java/src/com/metaweb/gridworks/tests/util/ParsingUtilitiesTests.java
similarity index 100%
rename from tests/java/src/com/metaweb/gridworks/tests/util/ParsingUtilitiesTests.java
rename to main/tests/java/src/com/metaweb/gridworks/tests/util/ParsingUtilitiesTests.java
diff --git a/tests/java/src/log4j.properties b/main/tests/java/src/log4j.properties
similarity index 100%
rename from tests/java/src/log4j.properties
rename to main/tests/java/src/log4j.properties
diff --git a/tests/windmill/js/facets.js b/main/tests/windmill/js/facets.js
similarity index 100%
rename from tests/windmill/js/facets.js
rename to main/tests/windmill/js/facets.js
diff --git a/tests/windmill/js/initialize.js b/main/tests/windmill/js/initialize.js
similarity index 100%
rename from tests/windmill/js/initialize.js
rename to main/tests/windmill/js/initialize.js
diff --git a/server/java/com/metaweb/gridworks/Configurations.java b/server/src/com/metaweb/gridworks/Configurations.java
similarity index 100%
rename from server/java/com/metaweb/gridworks/Configurations.java
rename to server/src/com/metaweb/gridworks/Configurations.java
diff --git a/server/java/com/metaweb/gridworks/Gridworks.java b/server/src/com/metaweb/gridworks/Gridworks.java
similarity index 100%
rename from server/java/com/metaweb/gridworks/Gridworks.java
rename to server/src/com/metaweb/gridworks/Gridworks.java
diff --git a/server/java/com/metaweb/util/logging/IndentingLayout.java b/server/src/com/metaweb/util/logging/IndentingLayout.java
similarity index 100%
rename from server/java/com/metaweb/util/logging/IndentingLayout.java
rename to server/src/com/metaweb/util/logging/IndentingLayout.java
diff --git a/server/java/com/metaweb/util/threads/ThreadPoolExecutorAdapter.java b/server/src/com/metaweb/util/threads/ThreadPoolExecutorAdapter.java
similarity index 100%
rename from server/java/com/metaweb/util/threads/ThreadPoolExecutorAdapter.java
rename to server/src/com/metaweb/util/threads/ThreadPoolExecutorAdapter.java
diff --git a/server/java/log4j.properties b/server/src/log4j.properties
similarity index 100%
rename from server/java/log4j.properties
rename to server/src/log4j.properties