1 files changed, 20 insertions, 12 deletions
diff --git a/src/cmd.zig b/src/cmd.zig
index c24cea5..8f4c971 100644
--- a/src/cmd.zig
+++ b/src/cmd.zig
@@ -16,6 +16,16 @@ 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;
+const EchoOff = @import("cmd/echo.zig").EchoOff;
+const EchoOn = @import("cmd/echo.zig").EchoOn;
+const EchoPlain = @import("cmd/echo.zig").EchoPlain;
+const EchoText = @import("cmd/echo.zig").EchoText;
+const Cls = @import("cmd/cls.zig").Cls;
+const Ver = @import("cmd/ver.zig").Ver;
+const Date = @import("cmd/date.zig").Date;
+const Time = @import("cmd/time.zig").Time;
+const Sort = @import("cmd/sort.zig").Sort;
+const Move = @import("cmd/move.zig").Move;
 
 pub const BuiltinCommand = union(enum) {
     // File-oriented
@@ -27,12 +37,12 @@ pub const BuiltinCommand = union(enum) {
     Fc,
     Find,
     Mkdir: Mkdir,
-    Move,
+    Move: Move,
     Remove: Remove,
     Rename: Rename,
     Replace,
     Rmdir: Rmdir,
-    Sort,
+    Sort: Sort,
     Tree: struct {
         path: []const u8,
     },
@@ -46,12 +56,10 @@ pub const BuiltinCommand = union(enum) {
     // Shell-oriented
     Append,
     Chdir: Chdir,
-    EchoOff,
-    EchoOn,
-    EchoPlain,
-    EchoText: struct {
-        message: []const u8,
-    },
+    EchoOff: EchoOff,
+    EchoOn: EchoOn,
+    EchoPlain: EchoPlain,
+    EchoText: EchoText,
     Exit,
     PathGet: PathGet,
     PathSet: PathSet,
@@ -64,14 +72,14 @@ pub const BuiltinCommand = union(enum) {
         value: []const u8,
     },
     Setver,
-    Ver,
+    Ver: Ver,
 
     // Utilities
-    Date,
-    Time,
+    Date: Date,
+    Time: Time,
 
     // Screen-oriented
-    Cls,
+    Cls: Cls,
     More,
 
     // Dummies