diff --git a/tunnel-server/pom.xml b/tunnel-server/pom.xml
index 259a24683..b56dc0270 100644
--- a/tunnel-server/pom.xml
+++ b/tunnel-server/pom.xml
@@ -134,6 +134,9 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<version>${spring-boot.version}</version>
+                <configuration>
+                    <executable>true</executable>
+                </configuration>
 				<executions>
 					<execution>
 						<id>repackage</id>
diff --git a/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/RedisTunnelClusterStore.java b/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/cluster/RedisTunnelClusterStore.java
similarity index 100%
rename from tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/RedisTunnelClusterStore.java
rename to tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/cluster/RedisTunnelClusterStore.java
diff --git a/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/TunnelClusterStore.java b/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/cluster/TunnelClusterStore.java
similarity index 100%
rename from tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/TunnelClusterStore.java
rename to tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/cluster/TunnelClusterStore.java