revert import changes

Author: m0mosenpai

client/commands/v2/__init__.py

@@ -12,6 +12,7 @@
 from . import kill  # noqa F401
 from . import persistent  # noqa F401
 from . import profile  # noqa F401
+from . import pysa_server  # noqa F401
 from . import query  # noqa F401
 from . import rage  # noqa F401
 from . import restart  # noqa F401
@@ -20,4 +21,3 @@
 from . import statistics  # noqa F401
 from . import stop  # noqa F401
 from . import validate_models  # noqa F401
-from ....client.commands.v2 import pysa_server  # noqa F401

client/tests/pyre_test.py

@@ -13,9 +13,9 @@
 from .. import (
     command_arguments,
     configuration,
+    pyre,
     recently_used_configurations,
 )
-from ...client import pyre
 from .setup import (
     ensure_directories_exists,
     switch_working_directory,