You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/07/18 13:09:10 UTC

[18/43] tinkerpop git commit: Reorganize Gremlin-DotNet

Reorganize Gremlin-DotNet

This merges the formerly three .NET projects into just one: Gremlin.Net. For more information see the discussion in TINKERPOP-1552.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f61227bc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f61227bc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f61227bc

Branch: refs/heads/tp32
Commit: f61227bc6bc7969e74e854830ec8d4eec00efe5e
Parents: 980c774
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Tue Jun 6 17:41:10 2017 +0200
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 28 15:13:11 2017 -0400

----------------------------------------------------------------------
 docs/src/reference/gremlin-variants.asciidoc    |  42 +-
 gremlin-csharp-generator/pom.xml                |   2 +-
 .../csharp/AnonymousTraversalGenerator.groovy   |   2 +-
 .../gremlin/csharp/EnumGenerator.groovy         |   2 +-
 .../gremlin/csharp/GenerateGremlinCSharp.groovy |  10 +-
 .../csharp/GraphTraversalGenerator.groovy       |   3 +-
 .../csharp/GraphTraversalSourceGenerator.groovy |   3 +-
 .../gremlin/csharp/PredicateGenerator.groovy    |   3 +-
 gremlin-dotnet/Gremlin.Net.sln                  |  37 +-
 .../src/Gremlin.CSharp/Gremlin.CSharp.csproj    |  21 -
 .../src/Gremlin.CSharp/Process/Barrier.cs       |  30 -
 .../src/Gremlin.CSharp/Process/Cardinality.cs   |  32 -
 .../src/Gremlin.CSharp/Process/Column.cs        |  31 -
 .../src/Gremlin.CSharp/Process/Direction.cs     |  32 -
 .../Gremlin.CSharp/Process/GraphTraversal.cs    | 630 -------------------
 .../Process/GraphTraversalSource.cs             | 143 -----
 .../src/Gremlin.CSharp/Process/Operator.cs      |  40 --
 .../src/Gremlin.CSharp/Process/Order.cs         |  36 --
 gremlin-dotnet/src/Gremlin.CSharp/Process/P.cs  | 108 ----
 .../src/Gremlin.CSharp/Process/Pick.cs          |  31 -
 .../src/Gremlin.CSharp/Process/Pop.cs           |  32 -
 .../src/Gremlin.CSharp/Process/Scope.cs         |  31 -
 gremlin-dotnet/src/Gremlin.CSharp/Process/T.cs  |  33 -
 gremlin-dotnet/src/Gremlin.CSharp/Process/__.cs | 488 --------------
 .../src/Gremlin.CSharp/Structure/Graph.cs       |  35 --
 .../Gremlin.Net.Process.csproj                  |  24 -
 .../Remote/IRemoteConnection.cs                 |  42 --
 .../Remote/RemoteStrategy.cs                    |  61 --
 .../Gremlin.Net.Process/Traversal/Binding.cs    |  80 ---
 .../Gremlin.Net.Process/Traversal/Bindings.cs   |  42 --
 .../Gremlin.Net.Process/Traversal/Bytecode.cs   |  85 ---
 .../Traversal/DefaultTraversal.cs               | 195 ------
 .../Gremlin.Net.Process/Traversal/ITraversal.cs |  96 ---
 .../Traversal/ITraversalSideEffects.cs          |  52 --
 .../Traversal/ITraversalStrategy.cs             |  46 --
 .../Traversal/Instruction.cs                    |  52 --
 .../Strategy/AbstractTraversalStrategy.cs       |  86 ---
 .../Strategy/Decoration/ConnectiveStrategy.cs   |  33 -
 .../Strategy/Decoration/ElementIdStrategy.cs    |  32 -
 .../Decoration/HaltedTraverserStrategy.cs       |  34 -
 .../Strategy/Decoration/PartitionStrategy.cs    |  56 --
 .../Strategy/Decoration/SubgraphStrategy.cs     |  48 --
 .../Decoration/VertexProgramStrategy.cs         |  50 --
 .../Finalization/MatchAlgorithmStrategy.cs      |  34 -
 .../Optimization/AdjacentToIncidentStrategy.cs  |  32 -
 .../Optimization/FilterRankingStrategy.cs       |  32 -
 .../Optimization/GraphFilterStrategy.cs         |  29 -
 .../Optimization/IdentityRemovalStrategy.cs     |  32 -
 .../Optimization/IncidentToAdjacentStrategy.cs  |  33 -
 .../Optimization/InlineFilterStrategy.cs        |  32 -
 .../Optimization/LazyBarrierStrategy.cs         |  33 -
 .../Optimization/MatchPredicateStrategy.cs      |  32 -
 .../Strategy/Optimization/OrderLimitStrategy.cs |  29 -
 .../Optimization/PathProcessorStrategy.cs       |  32 -
 .../Optimization/PathRetractionStrategy.cs      |  29 -
 .../Optimization/RangeByIsCountStrategy.cs      |  32 -
 .../Optimization/RepeatUnrollStrategy.cs        |  29 -
 .../Verification/LambdaRestrictionStrategy.cs   |  32 -
 .../Strategy/Verification/ReadOnlyStrategy.cs   |  32 -
 .../Traversal/TraversalPredicate.cs             |  85 ---
 .../Gremlin.Net.Process/Traversal/Traverser.cs  |  75 ---
 .../src/Gremlin.Net/Gremlin.Net.csproj          |   9 +-
 .../Process/Remote/IRemoteConnection.cs         |  42 ++
 .../Process/Remote/RemoteStrategy.cs            |  61 ++
 .../Gremlin.Net/Process/Traversal/Barrier.cs    |  30 +
 .../Gremlin.Net/Process/Traversal/Binding.cs    |  80 +++
 .../Gremlin.Net/Process/Traversal/Bindings.cs   |  42 ++
 .../Gremlin.Net/Process/Traversal/Bytecode.cs   |  85 +++
 .../Process/Traversal/Cardinality.cs            |  32 +
 .../src/Gremlin.Net/Process/Traversal/Column.cs |  31 +
 .../Process/Traversal/DefaultTraversal.cs       | 195 ++++++
 .../Gremlin.Net/Process/Traversal/Direction.cs  |  32 +
 .../Process/Traversal/GraphTraversal.cs         | 629 ++++++++++++++++++
 .../Process/Traversal/GraphTraversalSource.cs   | 142 +++++
 .../Gremlin.Net/Process/Traversal/ITraversal.cs |  96 +++
 .../Process/Traversal/ITraversalSideEffects.cs  |  52 ++
 .../Process/Traversal/ITraversalStrategy.cs     |  46 ++
 .../Process/Traversal/Instruction.cs            |  52 ++
 .../Gremlin.Net/Process/Traversal/Operator.cs   |  40 ++
 .../src/Gremlin.Net/Process/Traversal/Order.cs  |  36 ++
 .../src/Gremlin.Net/Process/Traversal/P.cs      | 107 ++++
 .../src/Gremlin.Net/Process/Traversal/Pick.cs   |  31 +
 .../src/Gremlin.Net/Process/Traversal/Pop.cs    |  32 +
 .../src/Gremlin.Net/Process/Traversal/Scope.cs  |  31 +
 .../Strategy/AbstractTraversalStrategy.cs       |  86 +++
 .../Strategy/Decoration/ConnectiveStrategy.cs   |  33 +
 .../Strategy/Decoration/ElementIdStrategy.cs    |  32 +
 .../Decoration/HaltedTraverserStrategy.cs       |  34 +
 .../Strategy/Decoration/PartitionStrategy.cs    |  56 ++
 .../Strategy/Decoration/SubgraphStrategy.cs     |  48 ++
 .../Decoration/VertexProgramStrategy.cs         |  50 ++
 .../Finalization/MatchAlgorithmStrategy.cs      |  34 +
 .../Optimization/AdjacentToIncidentStrategy.cs  |  32 +
 .../Optimization/FilterRankingStrategy.cs       |  32 +
 .../Optimization/GraphFilterStrategy.cs         |  29 +
 .../Optimization/IdentityRemovalStrategy.cs     |  32 +
 .../Optimization/IncidentToAdjacentStrategy.cs  |  33 +
 .../Optimization/InlineFilterStrategy.cs        |  32 +
 .../Optimization/LazyBarrierStrategy.cs         |  33 +
 .../Optimization/MatchPredicateStrategy.cs      |  32 +
 .../Strategy/Optimization/OrderLimitStrategy.cs |  29 +
 .../Optimization/PathProcessorStrategy.cs       |  32 +
 .../Optimization/PathRetractionStrategy.cs      |  29 +
 .../Optimization/RangeByIsCountStrategy.cs      |  32 +
 .../Optimization/RepeatUnrollStrategy.cs        |  29 +
 .../Verification/LambdaRestrictionStrategy.cs   |  32 +
 .../Strategy/Verification/ReadOnlyStrategy.cs   |  32 +
 .../src/Gremlin.Net/Process/Traversal/T.cs      |  33 +
 .../Process/Traversal/TraversalPredicate.cs     |  85 +++
 .../Gremlin.Net/Process/Traversal/Traverser.cs  |  75 +++
 .../src/Gremlin.Net/Process/Traversal/__.cs     | 488 ++++++++++++++
 .../src/Gremlin.Net/Structure/Graph.cs          |  35 ++
 .../BytecodeGenerationTests.cs                  |  76 ---
 .../BytecodeGeneration/StrategiesTests.cs       | 170 -----
 .../ConfigProvider.cs                           |  47 --
 .../DriverRemoteConnection/EnumTests.cs         |  59 --
 .../GraphTraversalSourceTests.cs                |  55 --
 .../GraphTraversalTests.cs                      | 171 -----
 .../DriverRemoteConnection/PredicateTests.cs    |  58 --
 .../RemoteConnectionFactory.cs                  |  41 --
 .../DriverRemoteConnection/SideEffectTests.cs   | 221 -------
 .../DriverRemoteConnection/StrategiesTests.cs   | 193 ------
 .../GraphSONWriterTests.cs                      |  50 --
 .../Gremlin.CSharp.IntegrationTest.csproj       |  38 --
 .../Properties/AssemblyInfo.cs                  |  44 --
 .../appsettings.json                            |   4 -
 .../GraphTraversalSourceTests.cs                |  68 --
 .../Gremlin.CSharp.UnitTest.csproj              |  21 -
 .../Gremlin.CSharp.UnitTest/PredicateTests.cs   |  50 --
 .../Gremlin.Net.IntegrationTest.csproj          |   1 -
 .../BytecodeGenerationTests.cs                  |  76 +++
 .../BytecodeGeneration/StrategiesTests.cs       | 170 +++++
 .../DriverRemoteConnection/EnumTests.cs         |  59 ++
 .../GraphTraversalSourceTests.cs                |  55 ++
 .../GraphTraversalTests.cs                      | 169 +++++
 .../DriverRemoteConnection/PredicateTests.cs    |  58 ++
 .../RemoteConnectionFactory.cs                  |  41 ++
 .../DriverRemoteConnection/SideEffectTests.cs   | 221 +++++++
 .../DriverRemoteConnection/StrategiesTests.cs   | 193 ++++++
 .../Process/Traversal/GraphSONWriterTests.cs    |  50 ++
 .../Gremlin.Net.Process.UnitTest.csproj         |  22 -
 .../Traversal/BytecodeTests.cs                  |  44 --
 .../Traversal/Strategy/StrategyTests.cs         | 109 ----
 .../Traversal/TestTraversal.cs                  |  51 --
 .../Traversal/TestTraversalStrategy.cs          |  50 --
 .../Traversal/TraversalTests.cs                 | 177 ------
 .../Traversal/TraverserTests.cs                 |  75 ---
 .../Gremlin.Net.UnitTest.csproj                 |   1 -
 .../Process/Traversal/BytecodeTests.cs          |  44 ++
 .../Traversal/GraphTraversalSourceTests.cs      |  68 ++
 .../Process/Traversal/PredicateTests.cs         |  50 ++
 .../Process/Traversal/Strategy/StrategyTests.cs | 109 ++++
 .../Process/Traversal/TestTraversal.cs          |  51 ++
 .../Process/Traversal/TestTraversalStrategy.cs  |  50 ++
 .../Process/Traversal/TraversalTests.cs         | 177 ++++++
 .../Process/Traversal/TraverserTests.cs         |  75 +++
 156 files changed, 5231 insertions(+), 5508 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/docs/src/reference/gremlin-variants.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index 01df632..763ab4a 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -356,40 +356,30 @@ connection = DriverRemoteConnection('ws://localhost:8182/gremlin', 'g',
                                      graphson_writer=graphson_writer)
 ----
 
-[[gremlin-csharp]]
-Gremlin-CSharp
+[[gremlin-DotNet]]
+Gremlin-DotNet
 --------------
-Apache TinkerPop's Gremlin-CSharp implements Gremlin within the C# language. It targets .NET Standard and can
+Apache TinkerPop's Gremlin-DotNet implements Gremlin within the C# language. It targets .NET Standard and can
 therefore be used on different operating systems and with different .NET frameworks, such as .NET Framework
 and link:https://www.microsoft.com/net/core[.NET Core]. Since the C# syntax is very similar to that of Java, it should be very easy to switch between
-Gremlin-Java and Gremlin-CSharp. The only major syntactical difference is that all method names in Gremlin-CSharp
+Gremlin-Java and Gremlin-DotNet. The only major syntactical difference is that all method names in Gremlin-DotNet
 use PascalCase as opposed to camelCase in Gremlin-Java in order to comply with .NET conventions.
 
 [source,powershell]
-nuget install Gremlin.CSharp
+nuget install Gremlin.Net
 
-In Gremlin-CSharp there exists `GraphTraversalSource`, `GraphTraversal`, and `__` which mirror the respective classes
+In Gremlin-DotNet there exists `GraphTraversalSource`, `GraphTraversal`, and `__` which mirror the respective classes
 in Gremlin-Java. The `GraphTraversalSource` requires a driver in order to communicate with <<gremlin-server,GremlinServer>> (or any
 RemoteConnection-enabled server).
 
-Gremlin-CSharp and Gremlin-DotNet
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Gremlin-CSharp is the C# language variant of Gremlin, but it needs a driver to communicate with a remote
-Gremlin Server. Such a driver is provided as part of Apache TinkerPop’s Gremlin-DotNet that also includes other
-useful functionality to work with Gremlin in .NET.
-Gremlin-DotNet is currently distributed in two NuGet packages:
-
-* `Gremlin.Net.Process` contains core functionality for Gremlin language variants and defines interfaces for drivers.
-Gremlin-CSharp depends on this package. So it will be installed automatically when you install Gremlin-CSharp.
-* `Gremlin.Net` contains a driver that allows Gremlin-CSharp to be used with a remote server and GraphSON serializers and deserializers.
+The `Gremlin.Net.Driver.Remote.DriverRemoteConnection` is provided as part of Apache TinkerPop’s Gremlin-DotNet.
 
 IMPORTANT: For developers wishing to provide another driver implementation, be sure to implement `IRemoteConnection` in
-`Gremlin.Net.Process.Remote` so it can then be used by Gremlin-CSharp’s `GraphTraversal`.
+`Gremlin.Net.Process.Remote` so it can then be used by Gremlin-DotNet’s `GraphTraversal`.
 
-When Gremlin Server is running, Gremlin-CSharp can communicate with Gremlin Server by sending traversals serialized as `Bytecode`.
+When Gremlin Server is running, Gremlin-DotNet can communicate with Gremlin Server by sending traversals serialized as `Bytecode`.
 
-IMPORTANT: Gremlin-CSharp is compatible with GraphSON 2.0 only, so this serializer must be configured in Gremlin Server.
+IMPORTANT: Gremlin-DotNet is compatible with GraphSON 2.0 only, so this serializer must be configured in Gremlin Server.
 
 A traversal source can be spawned with `RemoteStrategy` from an empty `Graph`.
 
@@ -401,7 +391,7 @@ var g = graph.Traversal().WithRemote(new DriverRemoteConnection(new GremlinClien
 
 When a traversal from the `GraphTraversalSource` is iterated, the traversal’s `Bytecode` is sent over the wire via the registered
 `IRemoteConnection`. The bytecode is used to construct the equivalent traversal at the remote traversal source.
-Since Gremlin-CSharp currently doesn't support lambda expressions, all traversals can be translated to Gremlin-Java on the remote
+Since Gremlin-DotNet currently doesn't support lambda expressions, all traversals can be translated to Gremlin-Java on the remote
 location (e.g. Gremlin Server).
 
 IMPORTANT: Gremlin-DotNet’s `ITraversal` interface supports the standard Gremlin methods such as `Next()`, `NextTraverser()`, `ToSet()`,
@@ -422,7 +412,7 @@ terminal/action methods off of `ITraversal`.
 Static Enums and Methods
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Gremlin has various tokens (e.g. `T`, `P`, `Order`, `Operator`, etc.) that are represented in Gremlin-CSharp as Enums.
+Gremlin has various tokens (e.g. `T`, `P`, `Order`, `Operator`, etc.) that are represented in Gremlin-DotNet as Enums.
 
 These can be used analogously to how they are used in Gremlin-Java.
 
@@ -433,8 +423,8 @@ Moreover, the class prefixes can be ommitted with a `using static`.
 
 [source,csharp]
 ----
-using static Gremlin.CSharp.Process.P;
-using static Gremlin.CSharp.Process.Order;
+using static Gremlin.Net.Process.Traversal.P;
+using static Gremlin.Net.Process.Traversal.Order;
 ----
 
 Then it is possible to represent the above traversal as below.
@@ -453,10 +443,10 @@ Bindings
 When a traversal bytecode is sent over a `IRemoteConnection` (e.g. Gremlin Server), it will be translated, compiled, 
 and then executed. If the same traversal is sent again, translation and compilation can be skipped as the previously 
 compiled version should be cached. Many traversals are unique up to some parameterization. For instance,
-`g.V(1).Out("created").Values("name")` is considered different from `g.V(4).Out('created').Values("Name")`
+`g.V(1).Out("created").Values("name")` is considered different from `g.V(4).Out("created").Values("Name")`
 as they have different script "string" representations. However, `g.V(x).Out("created").Values("name")` with bindings of 
 `{x : 1}` and `{x : 4}` are considered the same. If a traversal is going to be executed repeatedly, but with different 
-parameters, then bindings should be used. In Gremlin-CSharp, bindings are objects that can be created as follows.
+parameters, then bindings should be used. In Gremlin-DotNet, bindings are objects that can be created as follows.
 
 [source,csharp]
 ----

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-csharp-generator/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-csharp-generator/pom.xml b/gremlin-csharp-generator/pom.xml
index af0ae60..4e8989a 100644
--- a/gremlin-csharp-generator/pom.xml
+++ b/gremlin-csharp-generator/pom.xml
@@ -56,7 +56,7 @@ limitations under the License.
                         <configuration>
                             <mainClass>org.apache.tinkerpop.gremlin.csharp.GenerateGremlinCSharp</mainClass>
                             <arguments>
-                                <argument>${project.parent.basedir}/gremlin-dotnet/src/Gremlin.CSharp</argument>
+                                <argument>${project.parent.basedir}/gremlin-dotnet/src/Gremlin.Net</argument>
                             </arguments>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/AnonymousTraversalGenerator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/AnonymousTraversalGenerator.groovy b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/AnonymousTraversalGenerator.groovy
index 6e2e191..ccb22fc 100644
--- a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/AnonymousTraversalGenerator.groovy
+++ b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/AnonymousTraversalGenerator.groovy
@@ -34,7 +34,7 @@ class AnonymousTraversalGenerator {
 
         csharpClass.append(
 """
-namespace Gremlin.CSharp.Process
+namespace Gremlin.Net.Process.Traversal
 {
     public static class __
     {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/EnumGenerator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/EnumGenerator.groovy b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/EnumGenerator.groovy
index a389f9b..9214e0f 100644
--- a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/EnumGenerator.groovy
+++ b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/EnumGenerator.groovy
@@ -40,7 +40,7 @@ class EnumGenerator {
 
         csharpEnum.append(
                 """
-namespace Gremlin.CSharp.Process
+namespace Gremlin.Net.Process.Traversal
 {
     public enum ${enumClass.getSimpleName()}
     {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GenerateGremlinCSharp.groovy
----------------------------------------------------------------------
diff --git a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GenerateGremlinCSharp.groovy b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GenerateGremlinCSharp.groovy
index 7b03e5a..53eba17 100644
--- a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GenerateGremlinCSharp.groovy
+++ b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GenerateGremlinCSharp.groovy
@@ -23,10 +23,10 @@ public class GenerateGremlinCSharp {
 
     public static void main(String[] args) {
         final String csharpDirectory = args[0]
-        GraphTraversalSourceGenerator.create(csharpDirectory + "/Process/" + "GraphTraversalSource.cs")
-        GraphTraversalGenerator.create(csharpDirectory + "/Process/" + "GraphTraversal.cs")
-        AnonymousTraversalGenerator.create(csharpDirectory + "/Process/" + "__.cs")
-        EnumGenerator.create(csharpDirectory + "/Process/")
-        PredicateGenerator.create(csharpDirectory + "/Process/" + "P.cs")
+        GraphTraversalSourceGenerator.create(csharpDirectory + "/Process/Traversal/" + "GraphTraversalSource.cs")
+        GraphTraversalGenerator.create(csharpDirectory + "/Process/Traversal/" + "GraphTraversal.cs")
+        AnonymousTraversalGenerator.create(csharpDirectory + "/Process/Traversal/" + "__.cs")
+        EnumGenerator.create(csharpDirectory + "/Process/Traversal/")
+        PredicateGenerator.create(csharpDirectory + "/Process/Traversal/" + "P.cs")
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalGenerator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalGenerator.groovy b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalGenerator.groovy
index 54183a3..f8ecfb1 100644
--- a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalGenerator.groovy
+++ b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalGenerator.groovy
@@ -32,9 +32,8 @@ class GraphTraversalGenerator {
         csharpClass.append(
 """
 using System.Collections.Generic;
-using Gremlin.Net.Process.Traversal;
 
-namespace Gremlin.CSharp.Process
+namespace Gremlin.Net.Process.Traversal
 {
     public class GraphTraversal : DefaultTraversal
     {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalSourceGenerator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalSourceGenerator.groovy b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalSourceGenerator.groovy
index aaa35fb..6b93d73 100644
--- a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalSourceGenerator.groovy
+++ b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/GraphTraversalSourceGenerator.groovy
@@ -35,10 +35,9 @@ class GraphTraversalSourceGenerator {
 """
 using System.Collections.Generic;
 using Gremlin.Net.Process.Remote;
-using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Process.Traversal.Strategy.Decoration;
 
-namespace Gremlin.CSharp.Process
+namespace Gremlin.Net.Process.Traversal
 {
     public class GraphTraversalSource
     {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/PredicateGenerator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/PredicateGenerator.groovy b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/PredicateGenerator.groovy
index 72e3dba..0748ae9 100644
--- a/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/PredicateGenerator.groovy
+++ b/gremlin-csharp-generator/src/main/groovy/org/apache/tinkerpop/gremlin/csharp/PredicateGenerator.groovy
@@ -33,9 +33,8 @@ class PredicateGenerator {
 
         csharpClass.append(
 """
-using Gremlin.Net.Process.Traversal;
 
-namespace Gremlin.CSharp.Process
+namespace Gremlin.Net.Process.Traversal
 {
     public class P
     {""")

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/Gremlin.Net.sln
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/Gremlin.Net.sln b/gremlin-dotnet/Gremlin.Net.sln
index bfd565f..b1a5d19 100644
--- a/gremlin-dotnet/Gremlin.Net.sln
+++ b/gremlin-dotnet/Gremlin.Net.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26430.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{584F838B-DAE2-44F5-868C-1F532949C827}"
 EndProject
@@ -15,16 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.Net.UnitTest", "tes
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.Net.IntegrationTest", "test\Gremlin.Net.IntegrationTest\Gremlin.Net.IntegrationTest.csproj", "{CC54ABE3-13D2-491C-81E2-4D0355ABFA93}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.CSharp", "src\Gremlin.CSharp\Gremlin.CSharp.csproj", "{709D235A-CA13-434F-9AF9-8C8C009B11D7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.CSharp.IntegrationTest", "test\Gremlin.CSharp.IntegrationTest\Gremlin.CSharp.IntegrationTest.csproj", "{232F0F2B-178E-4214-99C7-CC4DC6710F44}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gremlin.Net.Process", "src\Gremlin.Net.Process\Gremlin.Net.Process.csproj", "{4949181B-C97D-4BB4-A312-9C1506EC7DA7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gremlin.Net.Process.UnitTest", "test\Gremlin.Net.Process.UnitTest\Gremlin.Net.Process.UnitTest.csproj", "{D97CA283-AC86-4EC9-9E1D-5F9A97977687}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gremlin.CSharp.UnitTest", "test\Gremlin.CSharp.UnitTest\Gremlin.CSharp.UnitTest.csproj", "{F2D976C2-D5EC-4BE5-9F6F-FCFAA9F59858}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,26 +33,6 @@ Global
 		{CC54ABE3-13D2-491C-81E2-4D0355ABFA93}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CC54ABE3-13D2-491C-81E2-4D0355ABFA93}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CC54ABE3-13D2-491C-81E2-4D0355ABFA93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{709D235A-CA13-434F-9AF9-8C8C009B11D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{709D235A-CA13-434F-9AF9-8C8C009B11D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{709D235A-CA13-434F-9AF9-8C8C009B11D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{709D235A-CA13-434F-9AF9-8C8C009B11D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{232F0F2B-178E-4214-99C7-CC4DC6710F44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{232F0F2B-178E-4214-99C7-CC4DC6710F44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{232F0F2B-178E-4214-99C7-CC4DC6710F44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{232F0F2B-178E-4214-99C7-CC4DC6710F44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4949181B-C97D-4BB4-A312-9C1506EC7DA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4949181B-C97D-4BB4-A312-9C1506EC7DA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4949181B-C97D-4BB4-A312-9C1506EC7DA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4949181B-C97D-4BB4-A312-9C1506EC7DA7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D97CA283-AC86-4EC9-9E1D-5F9A97977687}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D97CA283-AC86-4EC9-9E1D-5F9A97977687}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D97CA283-AC86-4EC9-9E1D-5F9A97977687}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D97CA283-AC86-4EC9-9E1D-5F9A97977687}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2D976C2-D5EC-4BE5-9F6F-FCFAA9F59858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2D976C2-D5EC-4BE5-9F6F-FCFAA9F59858}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2D976C2-D5EC-4BE5-9F6F-FCFAA9F59858}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2D976C2-D5EC-4BE5-9F6F-FCFAA9F59858}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -71,10 +41,5 @@ Global
 		{6C1DD34D-E30F-4E37-AACC-BEB8AD2320D8} = {584F838B-DAE2-44F5-868C-1F532949C827}
 		{1FAB781B-B857-4AD2-BEC8-E20C214D9E21} = {1B54FAC2-5411-4BB6-B450-FE2FFD8C4782}
 		{CC54ABE3-13D2-491C-81E2-4D0355ABFA93} = {1B54FAC2-5411-4BB6-B450-FE2FFD8C4782}
-		{709D235A-CA13-434F-9AF9-8C8C009B11D7} = {584F838B-DAE2-44F5-868C-1F532949C827}
-		{232F0F2B-178E-4214-99C7-CC4DC6710F44} = {1B54FAC2-5411-4BB6-B450-FE2FFD8C4782}
-		{4949181B-C97D-4BB4-A312-9C1506EC7DA7} = {584F838B-DAE2-44F5-868C-1F532949C827}
-		{D97CA283-AC86-4EC9-9E1D-5F9A97977687} = {1B54FAC2-5411-4BB6-B450-FE2FFD8C4782}
-		{F2D976C2-D5EC-4BE5-9F6F-FCFAA9F59858} = {1B54FAC2-5411-4BB6-B450-FE2FFD8C4782}
 	EndGlobalSection
 EndGlobal

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Gremlin.CSharp.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Gremlin.CSharp.csproj b/gremlin-dotnet/src/Gremlin.CSharp/Gremlin.CSharp.csproj
deleted file mode 100644
index 82291fc..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Gremlin.CSharp.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Version>3.2.5-SNAPSHOT</Version>
-    <TargetFramework>netstandard1.3</TargetFramework>
-    <AssemblyName>Gremlin.CSharp</AssemblyName>
-    <PackageId>Gremlin.CSharp</PackageId>
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <PackageProjectUrl>http://tinkerpop.apache.org</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/apache/tinkerpop/blob/master/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/apache/tinkerpop</RepositoryUrl>
-    <Description>Apache TinkerPop’s Gremlin-CSharp implements Gremlin within C# and can be used on any platform.</Description>
-    <PackageTags>gremlin-csharp;gremlin;tinkerpop</PackageTags>
-    <Authors>Apache TinkerPop</Authors>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Gremlin.Net.Process\Gremlin.Net.Process.csproj" />
-  </ItemGroup>
-
-</Project>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/Barrier.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/Barrier.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/Barrier.cs
deleted file mode 100644
index a74b47a..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/Barrier.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum Barrier
-    {
-        normSack
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/Cardinality.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/Cardinality.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/Cardinality.cs
deleted file mode 100644
index 4b9fae8..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/Cardinality.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum Cardinality
-    {
-        list,
-        set,
-        single
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/Column.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/Column.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/Column.cs
deleted file mode 100644
index c397b69..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/Column.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum Column
-    {
-        keys,
-        values
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/Direction.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/Direction.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/Direction.cs
deleted file mode 100644
index abdf7a2..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/Direction.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum Direction
-    {
-        BOTH,
-        IN,
-        OUT
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversal.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversal.cs
deleted file mode 100644
index 4397838..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversal.cs
+++ /dev/null
@@ -1,630 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-using System.Collections.Generic;
-using Gremlin.Net.Process.Traversal;
-
-namespace Gremlin.CSharp.Process
-{
-    public class GraphTraversal : DefaultTraversal
-    {
-        public GraphTraversal()
-            : this(new List<ITraversalStrategy>(), new Bytecode())
-        {
-        }
-
-        public GraphTraversal(ICollection<ITraversalStrategy> traversalStrategies, Bytecode bytecode)
-        {
-            TraversalStrategies = traversalStrategies;
-            Bytecode = bytecode;
-        }
-
-        public GraphTraversal V(params object[] args)
-        {
-            Bytecode.AddStep("V", args);
-            return this;
-        }
-
-        public GraphTraversal AddE(params object[] args)
-        {
-            Bytecode.AddStep("addE", args);
-            return this;
-        }
-
-        public GraphTraversal AddInE(params object[] args)
-        {
-            Bytecode.AddStep("addInE", args);
-            return this;
-        }
-
-        public GraphTraversal AddOutE(params object[] args)
-        {
-            Bytecode.AddStep("addOutE", args);
-            return this;
-        }
-
-        public GraphTraversal AddV(params object[] args)
-        {
-            Bytecode.AddStep("addV", args);
-            return this;
-        }
-
-        public GraphTraversal Aggregate(params object[] args)
-        {
-            Bytecode.AddStep("aggregate", args);
-            return this;
-        }
-
-        public GraphTraversal And(params object[] args)
-        {
-            Bytecode.AddStep("and", args);
-            return this;
-        }
-
-        public GraphTraversal As(params object[] args)
-        {
-            Bytecode.AddStep("as", args);
-            return this;
-        }
-
-        public GraphTraversal Barrier(params object[] args)
-        {
-            Bytecode.AddStep("barrier", args);
-            return this;
-        }
-
-        public GraphTraversal Both(params object[] args)
-        {
-            Bytecode.AddStep("both", args);
-            return this;
-        }
-
-        public GraphTraversal BothE(params object[] args)
-        {
-            Bytecode.AddStep("bothE", args);
-            return this;
-        }
-
-        public GraphTraversal BothV(params object[] args)
-        {
-            Bytecode.AddStep("bothV", args);
-            return this;
-        }
-
-        public GraphTraversal Branch(params object[] args)
-        {
-            Bytecode.AddStep("branch", args);
-            return this;
-        }
-
-        public GraphTraversal By(params object[] args)
-        {
-            Bytecode.AddStep("by", args);
-            return this;
-        }
-
-        public GraphTraversal Cap(params object[] args)
-        {
-            Bytecode.AddStep("cap", args);
-            return this;
-        }
-
-        public GraphTraversal Choose(params object[] args)
-        {
-            Bytecode.AddStep("choose", args);
-            return this;
-        }
-
-        public GraphTraversal Coalesce(params object[] args)
-        {
-            Bytecode.AddStep("coalesce", args);
-            return this;
-        }
-
-        public GraphTraversal Coin(params object[] args)
-        {
-            Bytecode.AddStep("coin", args);
-            return this;
-        }
-
-        public GraphTraversal Constant(params object[] args)
-        {
-            Bytecode.AddStep("constant", args);
-            return this;
-        }
-
-        public GraphTraversal Count(params object[] args)
-        {
-            Bytecode.AddStep("count", args);
-            return this;
-        }
-
-        public GraphTraversal CyclicPath(params object[] args)
-        {
-            Bytecode.AddStep("cyclicPath", args);
-            return this;
-        }
-
-        public GraphTraversal Dedup(params object[] args)
-        {
-            Bytecode.AddStep("dedup", args);
-            return this;
-        }
-
-        public GraphTraversal Drop(params object[] args)
-        {
-            Bytecode.AddStep("drop", args);
-            return this;
-        }
-
-        public GraphTraversal Emit(params object[] args)
-        {
-            Bytecode.AddStep("emit", args);
-            return this;
-        }
-
-        public GraphTraversal Filter(params object[] args)
-        {
-            Bytecode.AddStep("filter", args);
-            return this;
-        }
-
-        public GraphTraversal FlatMap(params object[] args)
-        {
-            Bytecode.AddStep("flatMap", args);
-            return this;
-        }
-
-        public GraphTraversal Fold(params object[] args)
-        {
-            Bytecode.AddStep("fold", args);
-            return this;
-        }
-
-        public GraphTraversal From(params object[] args)
-        {
-            Bytecode.AddStep("from", args);
-            return this;
-        }
-
-        public GraphTraversal Group(params object[] args)
-        {
-            Bytecode.AddStep("group", args);
-            return this;
-        }
-
-        public GraphTraversal GroupCount(params object[] args)
-        {
-            Bytecode.AddStep("groupCount", args);
-            return this;
-        }
-
-        public GraphTraversal GroupV3d0(params object[] args)
-        {
-            Bytecode.AddStep("groupV3d0", args);
-            return this;
-        }
-
-        public GraphTraversal Has(params object[] args)
-        {
-            Bytecode.AddStep("has", args);
-            return this;
-        }
-
-        public GraphTraversal HasId(params object[] args)
-        {
-            Bytecode.AddStep("hasId", args);
-            return this;
-        }
-
-        public GraphTraversal HasKey(params object[] args)
-        {
-            Bytecode.AddStep("hasKey", args);
-            return this;
-        }
-
-        public GraphTraversal HasLabel(params object[] args)
-        {
-            Bytecode.AddStep("hasLabel", args);
-            return this;
-        }
-
-        public GraphTraversal HasNot(params object[] args)
-        {
-            Bytecode.AddStep("hasNot", args);
-            return this;
-        }
-
-        public GraphTraversal HasValue(params object[] args)
-        {
-            Bytecode.AddStep("hasValue", args);
-            return this;
-        }
-
-        public GraphTraversal Id(params object[] args)
-        {
-            Bytecode.AddStep("id", args);
-            return this;
-        }
-
-        public GraphTraversal Identity(params object[] args)
-        {
-            Bytecode.AddStep("identity", args);
-            return this;
-        }
-
-        public GraphTraversal In(params object[] args)
-        {
-            Bytecode.AddStep("in", args);
-            return this;
-        }
-
-        public GraphTraversal InE(params object[] args)
-        {
-            Bytecode.AddStep("inE", args);
-            return this;
-        }
-
-        public GraphTraversal InV(params object[] args)
-        {
-            Bytecode.AddStep("inV", args);
-            return this;
-        }
-
-        public GraphTraversal Inject(params object[] args)
-        {
-            Bytecode.AddStep("inject", args);
-            return this;
-        }
-
-        public GraphTraversal Is(params object[] args)
-        {
-            Bytecode.AddStep("is", args);
-            return this;
-        }
-
-        public GraphTraversal Key(params object[] args)
-        {
-            Bytecode.AddStep("key", args);
-            return this;
-        }
-
-        public GraphTraversal Label(params object[] args)
-        {
-            Bytecode.AddStep("label", args);
-            return this;
-        }
-
-        public GraphTraversal Limit(params object[] args)
-        {
-            Bytecode.AddStep("limit", args);
-            return this;
-        }
-
-        public GraphTraversal Local(params object[] args)
-        {
-            Bytecode.AddStep("local", args);
-            return this;
-        }
-
-        public GraphTraversal Loops(params object[] args)
-        {
-            Bytecode.AddStep("loops", args);
-            return this;
-        }
-
-        public GraphTraversal Map(params object[] args)
-        {
-            Bytecode.AddStep("map", args);
-            return this;
-        }
-
-        public GraphTraversal MapKeys(params object[] args)
-        {
-            Bytecode.AddStep("mapKeys", args);
-            return this;
-        }
-
-        public GraphTraversal MapValues(params object[] args)
-        {
-            Bytecode.AddStep("mapValues", args);
-            return this;
-        }
-
-        public GraphTraversal Match(params object[] args)
-        {
-            Bytecode.AddStep("match", args);
-            return this;
-        }
-
-        public GraphTraversal Max(params object[] args)
-        {
-            Bytecode.AddStep("max", args);
-            return this;
-        }
-
-        public GraphTraversal Mean(params object[] args)
-        {
-            Bytecode.AddStep("mean", args);
-            return this;
-        }
-
-        public GraphTraversal Min(params object[] args)
-        {
-            Bytecode.AddStep("min", args);
-            return this;
-        }
-
-        public GraphTraversal Not(params object[] args)
-        {
-            Bytecode.AddStep("not", args);
-            return this;
-        }
-
-        public GraphTraversal Option(params object[] args)
-        {
-            Bytecode.AddStep("option", args);
-            return this;
-        }
-
-        public GraphTraversal Optional(params object[] args)
-        {
-            Bytecode.AddStep("optional", args);
-            return this;
-        }
-
-        public GraphTraversal Or(params object[] args)
-        {
-            Bytecode.AddStep("or", args);
-            return this;
-        }
-
-        public GraphTraversal Order(params object[] args)
-        {
-            Bytecode.AddStep("order", args);
-            return this;
-        }
-
-        public GraphTraversal OtherV(params object[] args)
-        {
-            Bytecode.AddStep("otherV", args);
-            return this;
-        }
-
-        public GraphTraversal Out(params object[] args)
-        {
-            Bytecode.AddStep("out", args);
-            return this;
-        }
-
-        public GraphTraversal OutE(params object[] args)
-        {
-            Bytecode.AddStep("outE", args);
-            return this;
-        }
-
-        public GraphTraversal OutV(params object[] args)
-        {
-            Bytecode.AddStep("outV", args);
-            return this;
-        }
-
-        public GraphTraversal PageRank(params object[] args)
-        {
-            Bytecode.AddStep("pageRank", args);
-            return this;
-        }
-
-        public GraphTraversal Path(params object[] args)
-        {
-            Bytecode.AddStep("path", args);
-            return this;
-        }
-
-        public GraphTraversal PeerPressure(params object[] args)
-        {
-            Bytecode.AddStep("peerPressure", args);
-            return this;
-        }
-
-        public GraphTraversal Profile(params object[] args)
-        {
-            Bytecode.AddStep("profile", args);
-            return this;
-        }
-
-        public GraphTraversal Program(params object[] args)
-        {
-            Bytecode.AddStep("program", args);
-            return this;
-        }
-
-        public GraphTraversal Project(params object[] args)
-        {
-            Bytecode.AddStep("project", args);
-            return this;
-        }
-
-        public GraphTraversal Properties(params object[] args)
-        {
-            Bytecode.AddStep("properties", args);
-            return this;
-        }
-
-        public GraphTraversal Property(params object[] args)
-        {
-            Bytecode.AddStep("property", args);
-            return this;
-        }
-
-        public GraphTraversal PropertyMap(params object[] args)
-        {
-            Bytecode.AddStep("propertyMap", args);
-            return this;
-        }
-
-        public GraphTraversal Range(params object[] args)
-        {
-            Bytecode.AddStep("range", args);
-            return this;
-        }
-
-        public GraphTraversal Repeat(params object[] args)
-        {
-            Bytecode.AddStep("repeat", args);
-            return this;
-        }
-
-        public GraphTraversal Sack(params object[] args)
-        {
-            Bytecode.AddStep("sack", args);
-            return this;
-        }
-
-        public GraphTraversal Sample(params object[] args)
-        {
-            Bytecode.AddStep("sample", args);
-            return this;
-        }
-
-        public GraphTraversal Select(params object[] args)
-        {
-            Bytecode.AddStep("select", args);
-            return this;
-        }
-
-        public GraphTraversal SideEffect(params object[] args)
-        {
-            Bytecode.AddStep("sideEffect", args);
-            return this;
-        }
-
-        public GraphTraversal SimplePath(params object[] args)
-        {
-            Bytecode.AddStep("simplePath", args);
-            return this;
-        }
-
-        public GraphTraversal Store(params object[] args)
-        {
-            Bytecode.AddStep("store", args);
-            return this;
-        }
-
-        public GraphTraversal Subgraph(params object[] args)
-        {
-            Bytecode.AddStep("subgraph", args);
-            return this;
-        }
-
-        public GraphTraversal Sum(params object[] args)
-        {
-            Bytecode.AddStep("sum", args);
-            return this;
-        }
-
-        public GraphTraversal Tail(params object[] args)
-        {
-            Bytecode.AddStep("tail", args);
-            return this;
-        }
-
-        public GraphTraversal TimeLimit(params object[] args)
-        {
-            Bytecode.AddStep("timeLimit", args);
-            return this;
-        }
-
-        public GraphTraversal Times(params object[] args)
-        {
-            Bytecode.AddStep("times", args);
-            return this;
-        }
-
-        public GraphTraversal To(params object[] args)
-        {
-            Bytecode.AddStep("to", args);
-            return this;
-        }
-
-        public GraphTraversal ToE(params object[] args)
-        {
-            Bytecode.AddStep("toE", args);
-            return this;
-        }
-
-        public GraphTraversal ToV(params object[] args)
-        {
-            Bytecode.AddStep("toV", args);
-            return this;
-        }
-
-        public GraphTraversal Tree(params object[] args)
-        {
-            Bytecode.AddStep("tree", args);
-            return this;
-        }
-
-        public GraphTraversal Unfold(params object[] args)
-        {
-            Bytecode.AddStep("unfold", args);
-            return this;
-        }
-
-        public GraphTraversal Union(params object[] args)
-        {
-            Bytecode.AddStep("union", args);
-            return this;
-        }
-
-        public GraphTraversal Until(params object[] args)
-        {
-            Bytecode.AddStep("until", args);
-            return this;
-        }
-
-        public GraphTraversal Value(params object[] args)
-        {
-            Bytecode.AddStep("value", args);
-            return this;
-        }
-
-        public GraphTraversal ValueMap(params object[] args)
-        {
-            Bytecode.AddStep("valueMap", args);
-            return this;
-        }
-
-        public GraphTraversal Values(params object[] args)
-        {
-            Bytecode.AddStep("values", args);
-            return this;
-        }
-
-        public GraphTraversal Where(params object[] args)
-        {
-            Bytecode.AddStep("where", args);
-            return this;
-        }
-	}
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversalSource.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversalSource.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversalSource.cs
deleted file mode 100644
index e68fdee..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/GraphTraversalSource.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-using System.Collections.Generic;
-using Gremlin.Net.Process.Remote;
-using Gremlin.Net.Process.Traversal;
-using Gremlin.Net.Process.Traversal.Strategy.Decoration;
-
-namespace Gremlin.CSharp.Process
-{
-    public class GraphTraversalSource
-    {
-        public ICollection<ITraversalStrategy> TraversalStrategies { get; set; }
-        public Bytecode Bytecode { get; set; }
-
-         public GraphTraversalSource()
-            : this(new List<ITraversalStrategy>(), new Bytecode())
-        {
-        }
-
-        public GraphTraversalSource(ICollection<ITraversalStrategy> traversalStrategies, Bytecode bytecode)
-        {
-            TraversalStrategies = traversalStrategies;
-            Bytecode = bytecode;
-        }
-
-        public GraphTraversalSource WithBulk(params object[] args)
-        {
-            var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
-                new Bytecode(Bytecode));
-            source.Bytecode.AddSource("withBulk", args);
-            return source;
-        }
-
-        public GraphTraversalSource WithPath(params object[] args)
-        {
-            var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
-                new Bytecode(Bytecode));
-            source.Bytecode.AddSource("withPath", args);
-            return source;
-        }
-
-        public GraphTraversalSource WithSack(params object[] args)
-        {
-            var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
-                new Bytecode(Bytecode));
-            source.Bytecode.AddSource("withSack", args);
-            return source;
-        }
-
-        public GraphTraversalSource WithSideEffect(params object[] args)
-        {
-            var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
-                new Bytecode(Bytecode));
-            source.Bytecode.AddSource("withSideEffect", args);
-            return source;
-        }
-
-        public GraphTraversalSource WithStrategies(params object[] args)
-        {
-            var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
-                new Bytecode(Bytecode));
-            source.Bytecode.AddSource("withStrategies", args);
-            return source;
-        }
-
-        public GraphTraversalSource WithoutStrategies(params object[] args)
-        {
-            var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
-                new Bytecode(Bytecode));
-            source.Bytecode.AddSource("withoutStrategies", args);
-            return source;
-        }
-
-        public GraphTraversalSource WithBindings(object bindings)
-        {
-            return this;
-        }
-
-        public GraphTraversalSource WithRemote(IRemoteConnection remoteConnection)
-        {
-            var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
-                new Bytecode(Bytecode));
-            source.TraversalStrategies.Add(new RemoteStrategy(remoteConnection));
-            return source;
-        }
-        
-        public GraphTraversalSource WithComputer(string graphComputer = null, int? workers = null, string persist = null,
-            string result = null, ITraversal vertices = null, ITraversal edges = null,
-            Dictionary<string, dynamic> configuration = null)
-        {
-            return WithStrategies(new VertexProgramStrategy(graphComputer, workers, persist, result, vertices, edges, configuration));
-        }
-
-        public GraphTraversal E(params object[] args)
-        {
-            var traversal = new GraphTraversal(TraversalStrategies, new Bytecode(Bytecode));
-            traversal.Bytecode.AddStep("E", args);
-            return traversal;
-        }
-
-        public GraphTraversal V(params object[] args)
-        {
-            var traversal = new GraphTraversal(TraversalStrategies, new Bytecode(Bytecode));
-            traversal.Bytecode.AddStep("V", args);
-            return traversal;
-        }
-
-        public GraphTraversal AddV(params object[] args)
-        {
-            var traversal = new GraphTraversal(TraversalStrategies, new Bytecode(Bytecode));
-            traversal.Bytecode.AddStep("addV", args);
-            return traversal;
-        }
-
-        public GraphTraversal Inject(params object[] args)
-        {
-            var traversal = new GraphTraversal(TraversalStrategies, new Bytecode(Bytecode));
-            traversal.Bytecode.AddStep("inject", args);
-            return traversal;
-        }
-	}
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/Operator.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/Operator.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/Operator.cs
deleted file mode 100644
index 5a9f805..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/Operator.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum Operator
-    {
-        addAll,
-        and,
-        assign,
-        div,
-        max,
-        min,
-        minus,
-        mult,
-        or,
-        sum,
-        sumLong
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/Order.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/Order.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/Order.cs
deleted file mode 100644
index 1a30c7d..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/Order.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum Order
-    {
-        decr,
-        incr,
-        keyDecr,
-        keyIncr,
-        shuffle,
-        valueDecr,
-        valueIncr
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/P.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/P.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/P.cs
deleted file mode 100644
index 62282b7..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/P.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-using Gremlin.Net.Process.Traversal;
-
-namespace Gremlin.CSharp.Process
-{
-    public class P
-    {
-        public static TraversalPredicate Between(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("between", value);
-        }
-
-        public static TraversalPredicate Eq(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("eq", value);
-        }
-
-        public static TraversalPredicate Gt(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("gt", value);
-        }
-
-        public static TraversalPredicate Gte(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("gte", value);
-        }
-
-        public static TraversalPredicate Inside(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("inside", value);
-        }
-
-        public static TraversalPredicate Lt(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("lt", value);
-        }
-
-        public static TraversalPredicate Lte(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("lte", value);
-        }
-
-        public static TraversalPredicate Neq(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("neq", value);
-        }
-
-        public static TraversalPredicate Not(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("not", value);
-        }
-
-        public static TraversalPredicate Outside(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("outside", value);
-        }
-
-        public static TraversalPredicate Test(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("test", value);
-        }
-
-        public static TraversalPredicate Within(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("within", value);
-        }
-
-        public static TraversalPredicate Without(params object[] args)
-        {
-            var value = args.Length == 1 ? args[0] : args;
-            return new TraversalPredicate("without", value);
-        }
-	}
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/Pick.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/Pick.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/Pick.cs
deleted file mode 100644
index 17c27d7..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/Pick.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum Pick
-    {
-        any,
-        none
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/Pop.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/Pop.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/Pop.cs
deleted file mode 100644
index 4e14d94..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/Pop.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum Pop
-    {
-        all,
-        first,
-        last
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/Scope.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/Scope.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/Scope.cs
deleted file mode 100644
index a9578ee..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/Scope.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum Scope
-    {
-        global,
-        local
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/T.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/T.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/T.cs
deleted file mode 100644
index 4bf9062..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/T.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public enum T
-    {
-        id,
-        key,
-        label,
-        value
-    }
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Process/__.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Process/__.cs b/gremlin-dotnet/src/Gremlin.CSharp/Process/__.cs
deleted file mode 100644
index 2db0082..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Process/__.cs
+++ /dev/null
@@ -1,488 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-namespace Gremlin.CSharp.Process
-{
-    public static class __
-    {
-        public static GraphTraversal Start()
-        {
-            return new GraphTraversal();
-        }
-
-        public static GraphTraversal V(params object[] args)
-        {
-            return new GraphTraversal().V(args);
-        }
-
-        public static GraphTraversal AddE(params object[] args)
-        {
-            return new GraphTraversal().AddE(args);
-        }
-
-        public static GraphTraversal AddInE(params object[] args)
-        {
-            return new GraphTraversal().AddInE(args);
-        }
-
-        public static GraphTraversal AddOutE(params object[] args)
-        {
-            return new GraphTraversal().AddOutE(args);
-        }
-
-        public static GraphTraversal AddV(params object[] args)
-        {
-            return new GraphTraversal().AddV(args);
-        }
-
-        public static GraphTraversal Aggregate(params object[] args)
-        {
-            return new GraphTraversal().Aggregate(args);
-        }
-
-        public static GraphTraversal And(params object[] args)
-        {
-            return new GraphTraversal().And(args);
-        }
-
-        public static GraphTraversal As(params object[] args)
-        {
-            return new GraphTraversal().As(args);
-        }
-
-        public static GraphTraversal Barrier(params object[] args)
-        {
-            return new GraphTraversal().Barrier(args);
-        }
-
-        public static GraphTraversal Both(params object[] args)
-        {
-            return new GraphTraversal().Both(args);
-        }
-
-        public static GraphTraversal BothE(params object[] args)
-        {
-            return new GraphTraversal().BothE(args);
-        }
-
-        public static GraphTraversal BothV(params object[] args)
-        {
-            return new GraphTraversal().BothV(args);
-        }
-
-        public static GraphTraversal Branch(params object[] args)
-        {
-            return new GraphTraversal().Branch(args);
-        }
-
-        public static GraphTraversal Cap(params object[] args)
-        {
-            return new GraphTraversal().Cap(args);
-        }
-
-        public static GraphTraversal Choose(params object[] args)
-        {
-            return new GraphTraversal().Choose(args);
-        }
-
-        public static GraphTraversal Coalesce(params object[] args)
-        {
-            return new GraphTraversal().Coalesce(args);
-        }
-
-        public static GraphTraversal Coin(params object[] args)
-        {
-            return new GraphTraversal().Coin(args);
-        }
-
-        public static GraphTraversal Constant(params object[] args)
-        {
-            return new GraphTraversal().Constant(args);
-        }
-
-        public static GraphTraversal Count(params object[] args)
-        {
-            return new GraphTraversal().Count(args);
-        }
-
-        public static GraphTraversal CyclicPath(params object[] args)
-        {
-            return new GraphTraversal().CyclicPath(args);
-        }
-
-        public static GraphTraversal Dedup(params object[] args)
-        {
-            return new GraphTraversal().Dedup(args);
-        }
-
-        public static GraphTraversal Drop(params object[] args)
-        {
-            return new GraphTraversal().Drop(args);
-        }
-
-        public static GraphTraversal Emit(params object[] args)
-        {
-            return new GraphTraversal().Emit(args);
-        }
-
-        public static GraphTraversal Filter(params object[] args)
-        {
-            return new GraphTraversal().Filter(args);
-        }
-
-        public static GraphTraversal FlatMap(params object[] args)
-        {
-            return new GraphTraversal().FlatMap(args);
-        }
-
-        public static GraphTraversal Fold(params object[] args)
-        {
-            return new GraphTraversal().Fold(args);
-        }
-
-        public static GraphTraversal Group(params object[] args)
-        {
-            return new GraphTraversal().Group(args);
-        }
-
-        public static GraphTraversal GroupCount(params object[] args)
-        {
-            return new GraphTraversal().GroupCount(args);
-        }
-
-        public static GraphTraversal GroupV3d0(params object[] args)
-        {
-            return new GraphTraversal().GroupV3d0(args);
-        }
-
-        public static GraphTraversal Has(params object[] args)
-        {
-            return new GraphTraversal().Has(args);
-        }
-
-        public static GraphTraversal HasId(params object[] args)
-        {
-            return new GraphTraversal().HasId(args);
-        }
-
-        public static GraphTraversal HasKey(params object[] args)
-        {
-            return new GraphTraversal().HasKey(args);
-        }
-
-        public static GraphTraversal HasLabel(params object[] args)
-        {
-            return new GraphTraversal().HasLabel(args);
-        }
-
-        public static GraphTraversal HasNot(params object[] args)
-        {
-            return new GraphTraversal().HasNot(args);
-        }
-
-        public static GraphTraversal HasValue(params object[] args)
-        {
-            return new GraphTraversal().HasValue(args);
-        }
-
-        public static GraphTraversal Id(params object[] args)
-        {
-            return new GraphTraversal().Id(args);
-        }
-
-        public static GraphTraversal Identity(params object[] args)
-        {
-            return new GraphTraversal().Identity(args);
-        }
-
-        public static GraphTraversal In(params object[] args)
-        {
-            return new GraphTraversal().In(args);
-        }
-
-        public static GraphTraversal InE(params object[] args)
-        {
-            return new GraphTraversal().InE(args);
-        }
-
-        public static GraphTraversal InV(params object[] args)
-        {
-            return new GraphTraversal().InV(args);
-        }
-
-        public static GraphTraversal Inject(params object[] args)
-        {
-            return new GraphTraversal().Inject(args);
-        }
-
-        public static GraphTraversal Is(params object[] args)
-        {
-            return new GraphTraversal().Is(args);
-        }
-
-        public static GraphTraversal Key(params object[] args)
-        {
-            return new GraphTraversal().Key(args);
-        }
-
-        public static GraphTraversal Label(params object[] args)
-        {
-            return new GraphTraversal().Label(args);
-        }
-
-        public static GraphTraversal Limit(params object[] args)
-        {
-            return new GraphTraversal().Limit(args);
-        }
-
-        public static GraphTraversal Local(params object[] args)
-        {
-            return new GraphTraversal().Local(args);
-        }
-
-        public static GraphTraversal Loops(params object[] args)
-        {
-            return new GraphTraversal().Loops(args);
-        }
-
-        public static GraphTraversal Map(params object[] args)
-        {
-            return new GraphTraversal().Map(args);
-        }
-
-        public static GraphTraversal MapKeys(params object[] args)
-        {
-            return new GraphTraversal().MapKeys(args);
-        }
-
-        public static GraphTraversal MapValues(params object[] args)
-        {
-            return new GraphTraversal().MapValues(args);
-        }
-
-        public static GraphTraversal Match(params object[] args)
-        {
-            return new GraphTraversal().Match(args);
-        }
-
-        public static GraphTraversal Max(params object[] args)
-        {
-            return new GraphTraversal().Max(args);
-        }
-
-        public static GraphTraversal Mean(params object[] args)
-        {
-            return new GraphTraversal().Mean(args);
-        }
-
-        public static GraphTraversal Min(params object[] args)
-        {
-            return new GraphTraversal().Min(args);
-        }
-
-        public static GraphTraversal Not(params object[] args)
-        {
-            return new GraphTraversal().Not(args);
-        }
-
-        public static GraphTraversal Optional(params object[] args)
-        {
-            return new GraphTraversal().Optional(args);
-        }
-
-        public static GraphTraversal Or(params object[] args)
-        {
-            return new GraphTraversal().Or(args);
-        }
-
-        public static GraphTraversal Order(params object[] args)
-        {
-            return new GraphTraversal().Order(args);
-        }
-
-        public static GraphTraversal OtherV(params object[] args)
-        {
-            return new GraphTraversal().OtherV(args);
-        }
-
-        public static GraphTraversal Out(params object[] args)
-        {
-            return new GraphTraversal().Out(args);
-        }
-
-        public static GraphTraversal OutE(params object[] args)
-        {
-            return new GraphTraversal().OutE(args);
-        }
-
-        public static GraphTraversal OutV(params object[] args)
-        {
-            return new GraphTraversal().OutV(args);
-        }
-
-        public static GraphTraversal Path(params object[] args)
-        {
-            return new GraphTraversal().Path(args);
-        }
-
-        public static GraphTraversal Project(params object[] args)
-        {
-            return new GraphTraversal().Project(args);
-        }
-
-        public static GraphTraversal Properties(params object[] args)
-        {
-            return new GraphTraversal().Properties(args);
-        }
-
-        public static GraphTraversal Property(params object[] args)
-        {
-            return new GraphTraversal().Property(args);
-        }
-
-        public static GraphTraversal PropertyMap(params object[] args)
-        {
-            return new GraphTraversal().PropertyMap(args);
-        }
-
-        public static GraphTraversal Range(params object[] args)
-        {
-            return new GraphTraversal().Range(args);
-        }
-
-        public static GraphTraversal Repeat(params object[] args)
-        {
-            return new GraphTraversal().Repeat(args);
-        }
-
-        public static GraphTraversal Sack(params object[] args)
-        {
-            return new GraphTraversal().Sack(args);
-        }
-
-        public static GraphTraversal Sample(params object[] args)
-        {
-            return new GraphTraversal().Sample(args);
-        }
-
-        public static GraphTraversal Select(params object[] args)
-        {
-            return new GraphTraversal().Select(args);
-        }
-
-        public static GraphTraversal SideEffect(params object[] args)
-        {
-            return new GraphTraversal().SideEffect(args);
-        }
-
-        public static GraphTraversal SimplePath(params object[] args)
-        {
-            return new GraphTraversal().SimplePath(args);
-        }
-
-        public static GraphTraversal Store(params object[] args)
-        {
-            return new GraphTraversal().Store(args);
-        }
-
-        public static GraphTraversal Subgraph(params object[] args)
-        {
-            return new GraphTraversal().Subgraph(args);
-        }
-
-        public static GraphTraversal Sum(params object[] args)
-        {
-            return new GraphTraversal().Sum(args);
-        }
-
-        public static GraphTraversal Tail(params object[] args)
-        {
-            return new GraphTraversal().Tail(args);
-        }
-
-        public static GraphTraversal TimeLimit(params object[] args)
-        {
-            return new GraphTraversal().TimeLimit(args);
-        }
-
-        public static GraphTraversal Times(params object[] args)
-        {
-            return new GraphTraversal().Times(args);
-        }
-
-        public static GraphTraversal To(params object[] args)
-        {
-            return new GraphTraversal().To(args);
-        }
-
-        public static GraphTraversal ToE(params object[] args)
-        {
-            return new GraphTraversal().ToE(args);
-        }
-
-        public static GraphTraversal ToV(params object[] args)
-        {
-            return new GraphTraversal().ToV(args);
-        }
-
-        public static GraphTraversal Tree(params object[] args)
-        {
-            return new GraphTraversal().Tree(args);
-        }
-
-        public static GraphTraversal Unfold(params object[] args)
-        {
-            return new GraphTraversal().Unfold(args);
-        }
-
-        public static GraphTraversal Union(params object[] args)
-        {
-            return new GraphTraversal().Union(args);
-        }
-
-        public static GraphTraversal Until(params object[] args)
-        {
-            return new GraphTraversal().Until(args);
-        }
-
-        public static GraphTraversal Value(params object[] args)
-        {
-            return new GraphTraversal().Value(args);
-        }
-
-        public static GraphTraversal ValueMap(params object[] args)
-        {
-            return new GraphTraversal().ValueMap(args);
-        }
-
-        public static GraphTraversal Values(params object[] args)
-        {
-            return new GraphTraversal().Values(args);
-        }
-
-        public static GraphTraversal Where(params object[] args)
-        {
-            return new GraphTraversal().Where(args);
-        }
-	}
-}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.CSharp/Structure/Graph.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.CSharp/Structure/Graph.cs b/gremlin-dotnet/src/Gremlin.CSharp/Structure/Graph.cs
deleted file mode 100644
index 3ae5bef..0000000
--- a/gremlin-dotnet/src/Gremlin.CSharp/Structure/Graph.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-using Gremlin.CSharp.Process;
-
-namespace Gremlin.CSharp.Structure
-{
-    public class Graph
-    {
-        public GraphTraversalSource Traversal()
-        {
-            return new GraphTraversalSource();
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f61227bc/gremlin-dotnet/src/Gremlin.Net.Process/Gremlin.Net.Process.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net.Process/Gremlin.Net.Process.csproj b/gremlin-dotnet/src/Gremlin.Net.Process/Gremlin.Net.Process.csproj
deleted file mode 100644
index 5e2d7fc..0000000
--- a/gremlin-dotnet/src/Gremlin.Net.Process/Gremlin.Net.Process.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Version>3.2.5-SNAPSHOT</Version>
-    <TargetFramework>netstandard1.3</TargetFramework>
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <PackageProjectUrl>http://tinkerpop.apache.org</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/apache/tinkerpop/blob/master/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/apache/tinkerpop</RepositoryUrl>
-    <Authors>Apache TinkerPop</Authors>
-    <PackageTags>gremlin;tinkerpop;gremlin-dotnet</PackageTags>
-    <Description>This package provides implementations and interfaces for Gremlin language variants.</Description>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile></DocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
-    <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file