diff --git a/build.gradle b/build.gradle
index 0cdf5df..dd7605d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 }
 
 embulkPlugin {
-    mainClass = "org.embulk.output.CommandFileOutputPlugin"
+    mainClass = "org.embulk.output.command.CommandFileOutputPlugin"
     category = "output"
     type = "command"
 }
diff --git a/src/main/java/org/embulk/output/CommandFileOutputPlugin.java b/src/main/java/org/embulk/output/command/CommandFileOutputPlugin.java
similarity index 99%
rename from src/main/java/org/embulk/output/CommandFileOutputPlugin.java
rename to src/main/java/org/embulk/output/command/CommandFileOutputPlugin.java
index 65a21d6..4054423 100644
--- a/src/main/java/org/embulk/output/CommandFileOutputPlugin.java
+++ b/src/main/java/org/embulk/output/command/CommandFileOutputPlugin.java
@@ -1,4 +1,4 @@
-package org.embulk.output;
+package org.embulk.output.command;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/src/test/java/org/embulk/output/TestCommandFileOutputPlugin.java b/src/test/java/org/embulk/output/command/TestCommandFileOutputPlugin.java
similarity index 86%
rename from src/test/java/org/embulk/output/TestCommandFileOutputPlugin.java
rename to src/test/java/org/embulk/output/command/TestCommandFileOutputPlugin.java
index 86b2bc0..b126ce0 100644
--- a/src/test/java/org/embulk/output/TestCommandFileOutputPlugin.java
+++ b/src/test/java/org/embulk/output/command/TestCommandFileOutputPlugin.java
@@ -1,6 +1,6 @@
-package org.embulk.output;
+package org.embulk.output.command;
 
-import static org.embulk.output.CommandFileOutputPlugin.buildShell;
+import static org.embulk.output.command.CommandFileOutputPlugin.buildShell;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;