diff --git a/client/find_symbols.py b/client/commands/find_symbols.py
similarity index 100%
rename from client/find_symbols.py
rename to client/commands/find_symbols.py
diff --git a/client/tests/find_symbols_test.py b/client/commands/tests/find_symbols_test.py
similarity index 98%
rename from client/tests/find_symbols_test.py
rename to client/commands/tests/find_symbols_test.py
index 598ca36bbbd..41523872ab9 100644
--- a/client/tests/find_symbols_test.py
+++ b/client/commands/tests/find_symbols_test.py
@@ -7,16 +7,17 @@
 from typing import List
 
 import testslide
-from tools.pyre.client.commands.language_server_protocol import (
+
+from ..find_symbols import (
+    UnparseableError,
+    parse_source_and_collect_symbols,
+)
+from ..language_server_protocol import (
     DocumentSymbolsResponse,
     LspPosition,
     LspRange,
     SymbolKind,
 )
-from tools.pyre.client.find_symbols import (
-    UnparseableError,
-    parse_source_and_collect_symbols,
-)
 
 
 class FindSymbolTests(testslide.TestCase):