diff --git a/fx.cmdline/arg.c b/fx.cmdline/arg.c
index b58b751..c108fbd 100644
--- a/fx.cmdline/arg.c
+++ b/fx.cmdline/arg.c
@@ -1,6 +1,6 @@
 #include "command.h"
 
-#include <fx/cmd.h>
+#include <fx/cmdline/cmd.h>
 #include <fx/string.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/fx.cmdline/arglist.c b/fx.cmdline/arglist.c
index 75d952f..2bde03b 100644
--- a/fx.cmdline/arglist.c
+++ b/fx.cmdline/arglist.c
@@ -1,6 +1,6 @@
 #include "command.h"
 
-#include <fx/cmd.h>
+#include <fx/cmdline/cmd.h>
 #include <fx/misc.h>
 #include <fx/string.h>
 #include <fx/term/print.h>
diff --git a/fx.cmdline/command.c b/fx.cmdline/command.c
index 3c01f15..9abff2a 100644
--- a/fx.cmdline/command.c
+++ b/fx.cmdline/command.c
@@ -1,7 +1,7 @@
 #include "command.h"
 
 #include <fx/bst.h>
-#include <fx/cmd.h>
+#include <fx/cmdline/cmd.h>
 #include <fx/string.h>
 #include <fx/term/print.h>
 #include <fx/term/tty.h>
diff --git a/fx.cmdline/command.h b/fx.cmdline/command.h
index 414d549..e37884f 100644
--- a/fx.cmdline/command.h
+++ b/fx.cmdline/command.h
@@ -2,7 +2,7 @@
 #define _FX_COMMAND_H_
 
 #include <fx/bst.h>
-#include <fx/cmd.h>
+#include <fx/cmdline/cmd.h>
 #include <fx/queue.h>
 #include <fx/string.h>
 
diff --git a/fx.cmdline/include/fx/cmd.h b/fx.cmdline/include/fx/cmdline/cmd.h
similarity index 100%
rename from fx.cmdline/include/fx/cmd.h
rename to fx.cmdline/include/fx/cmdline/cmd.h
diff --git a/fx.cmdline/option.c b/fx.cmdline/option.c
index 4b59e5a..9e45d36 100644
--- a/fx.cmdline/option.c
+++ b/fx.cmdline/option.c
@@ -1,6 +1,6 @@
 #include "command.h"
 
-#include <fx/cmd.h>
+#include <fx/cmdline/cmd.h>
 #include <fx/string.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/fx.cmdline/test/example.c b/fx.cmdline/test/example.c
index 6ea791f..26c6ab2 100644
--- a/fx.cmdline/test/example.c
+++ b/fx.cmdline/test/example.c
@@ -1,4 +1,4 @@
-#include <fx/cmd.h>
+#include <fx/cmdline/cmd.h>
 #include <stdio.h>
 
 enum {
@@ -27,16 +27,24 @@ const char *text
 	  "great pleasure.";
 
 static int test_command(
-	const fx_command *self, const fx_arglist *opt, const fx_array *args)
+	const fx_command *self,
+	const fx_arglist *opt,
+	const fx_array *args)
 {
 	printf("Hello, world!\n");
 
 	fx_arglist_iterator it;
 	fx_arglist_iterator_begin(
-		opt, FX_COMMAND_INVALID_ID, FX_COMMAND_INVALID_ID, &it);
+		opt,
+		FX_COMMAND_INVALID_ID,
+		FX_COMMAND_INVALID_ID,
+		&it);
 	while (fx_arglist_iterator_is_valid(&it)) {
-		printf("opt:%u,arg:%u,i:%zu,value: %s\n", it.opt_id,
-		       it.value->val_id, it.i, it.value->val_str);
+		printf("opt:%u,arg:%u,i:%zu,value: %s\n",
+		       it.opt_id,
+		       it.value->val_id,
+		       it.i,
+		       it.value->val_str);
 
 		fx_arglist_iterator_next(&it);
 	}