diff --git a/.vscode/launch.json b/.vscode/launch.json
index 06a988616d..8a35acc3ed 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,7 +8,7 @@
             "cwd": "${workspaceFolder}/clients/java/",
             "console": "externalTerminal",
             "stopOnEntry": false,
-            "mainClass": "com.microsoft.aspnet.signalr.Chat",
+            "mainClass": "com.microsoft.aspnet.signalr.sample.Chat",
             "args": ""
         },
         {
diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Chat.java b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/sample/Chat.java
similarity index 87%
rename from clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Chat.java
rename to clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/sample/Chat.java
index c306c26eef..cec5fe913c 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Chat.java
+++ b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/sample/Chat.java
@@ -1,10 +1,14 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-package com.microsoft.aspnet.signalr;
+package com.microsoft.aspnet.signalr.sample;
 
 import java.util.Scanner;
 
+import com.microsoft.aspnet.signalr.HubConnection;
+import com.microsoft.aspnet.signalr.HubConnectionBuilder;
+import com.microsoft.aspnet.signalr.LogLevel;
+
 public class Chat {
     public static void main(String[] args) throws Exception {
         System.out.println("Enter the URL of the SignalR Chat you want to join");