1 files changed, 18 insertions, 26 deletions
diff --git a/src/cmd.zig b/src/cmd.zig
index 665b2bf..c24cea5 100644
--- a/src/cmd.zig
+++ b/src/cmd.zig
@@ -7,6 +7,15 @@ const FileSpec = syntax.FileSpec;
 const Redirect = syntax.Redirect;
 
 const Copy = @import("cmd/copy.zig").Copy;
+const Chdir = @import("cmd/chdir.zig").Chdir;
+const Remove = @import("cmd/remove.zig").Remove;
+const Mkdir = @import("cmd/mkdir.zig").Mkdir;
+const Rmdir = @import("cmd/rmdir.zig").Rmdir;
+const Rename = @import("cmd/rename.zig").Rename;
+const PathGet = @import("cmd/path.zig").PathGet;
+const PathSet = @import("cmd/path.zig").PathSet;
+const Dir = @import("cmd/dir.zig").Dir;
+const Type = @import("cmd/type.zig").Type;
 
 pub const BuiltinCommand = union(enum) {
     // File-oriented
@@ -14,33 +23,20 @@ pub const BuiltinCommand = union(enum) {
     Deltree: struct {
         path: []const u8,
     },
-    Dir: struct {
-        path: []const u8,
-    },
+    Dir: Dir,
     Fc,
     Find,
-    Mkdir: struct {
-        path: []const u8,
-    },
+    Mkdir: Mkdir,
     Move,
-    Remove: struct {
-        path: []const u8,
-    },
-    Rename: struct {
-        from: FileSpec,
-        to: FileSpec,
-    },
+    Remove: Remove,
+    Rename: Rename,
     Replace,
-    Rmdir: struct {
-        path: []const u8,
-    },
+    Rmdir: Rmdir,
     Sort,
     Tree: struct {
         path: []const u8,
     },
-    Type: struct {
-        file: FileSpec,
-    },
+    Type: Type,
     Xcopy: struct {
         from: FileSpec,
         to: FileSpec,
@@ -49,9 +45,7 @@ pub const BuiltinCommand = union(enum) {
 
     // Shell-oriented
     Append,
-    Chdir: struct {
-        path: []const u8,
-    },
+    Chdir: Chdir,
     EchoOff,
     EchoOn,
     EchoPlain,
@@ -59,10 +53,8 @@ pub const BuiltinCommand = union(enum) {
         message: []const u8,
     },
     Exit,
-    PathGet,
-    PathSet: struct {
-        value: []const u8,
-    },
+    PathGet: PathGet,
+    PathSet: PathSet,
     PromptGet,
     PromptSet: struct {
         message: []const u8,