Command.cs renamed to CommandType.cs