diff --git a/build.gradle b/build.gradle
index dcde9c0..5337972 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 }
 
 embulkPlugin {
-    mainClass = "org.embulk.input.CommandFileInputPlugin"
+    mainClass = "org.embulk.input.command.CommandFileInputPlugin"
     category = "input"
     type = "command"
 }
diff --git a/src/main/java/org/embulk/input/command/CommandFileInputPlugin.java b/src/main/java/org/embulk/input/command/CommandFileInputPlugin.java
index 792b5fa..77958d3 100644
--- a/src/main/java/org/embulk/input/command/CommandFileInputPlugin.java
+++ b/src/main/java/org/embulk/input/command/CommandFileInputPlugin.java
@@ -1,4 +1,4 @@
-package org.embulk.input;
+package org.embulk.input.command;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/src/test/java/org/embulk/input/command/TestCommandFileInputPlugin.java b/src/test/java/org/embulk/input/command/TestCommandFileInputPlugin.java
index bc9ef33..d4fb927 100644
--- a/src/test/java/org/embulk/input/command/TestCommandFileInputPlugin.java
+++ b/src/test/java/org/embulk/input/command/TestCommandFileInputPlugin.java
@@ -1,6 +1,6 @@
-package org.embulk.input;
+package org.embulk.input.command;
 
-import static org.embulk.input.CommandFileInputPlugin.buildShell;
+import static org.embulk.input.command.CommandFileInputPlugin.buildShell;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;