diff --git a/worlds/civ_6/Civ6Client.py b/Civ6Client.py
similarity index 94%
rename from worlds/civ_6/Civ6Client.py
rename to Civ6Client.py
index a84095bf25..1fcdce0534 100644
--- a/worlds/civ_6/Civ6Client.py
+++ b/Civ6Client.py
@@ -6,15 +6,15 @@ from typing import Dict, List
 import zipfile
 
 from CommonClient import ClientCommandProcessor, CommonContext, get_base_parser, logger, server_loop, gui_enabled
-from .Data import get_progressive_districts_data
-from .DeathLink import handle_check_deathlink
+from worlds.civ_6.Data import get_progressive_districts_data
+from worlds.civ_6.DeathLink import handle_check_deathlink
 from NetUtils import ClientStatus
 import Utils
-from .CivVIInterface import CivVIInterface, ConnectionState
-from .Enum import CivVICheckType
-from .Items import CivVIItemData, generate_item_table, get_item_by_civ_name
-from .Locations import generate_era_location_table
-from .TunerClient import TunerErrorException, TunerTimeoutException
+from worlds.civ_6.CivVIInterface import CivVIInterface, ConnectionState
+from worlds.civ_6.Enum import CivVICheckType
+from worlds.civ_6.Items import CivVIItemData, generate_item_table, get_item_by_civ_name
+from worlds.civ_6.Locations import generate_era_location_table
+from worlds.civ_6.TunerClient import TunerErrorException, TunerTimeoutException
 
 
 class CivVICommandProcessor(ClientCommandProcessor):
@@ -336,3 +336,7 @@ def debug_main():
     if args.debug:
         logger.setLevel(logging.DEBUG)
     main(args.connect, args.password, args.name)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index d127bbea36..3a7b264a70 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -191,8 +191,11 @@ components: List[Component] = [
     Component('Zillion Client', 'ZillionClient',
               file_identifier=SuffixIdentifier('.apzl')),
 
-    #MegaMan Battle Network 3
-    Component('MMBN3 Client', 'MMBN3Client', file_identifier=SuffixIdentifier('.apbn3'))
+    # MegaMan Battle Network 3
+    Component('MMBN3 Client', 'MMBN3Client', file_identifier=SuffixIdentifier('.apbn3')),
+
+    # Civilization 6
+    Component("Civilization VI Client", "Civ6Client", file_identifier=SuffixIdentifier(".apcivvi"))
 ]
 
 
diff --git a/worlds/civ_6/__init__.py b/worlds/civ_6/__init__.py
index 7b9e99aacc..f426a77582 100644
--- a/worlds/civ_6/__init__.py
+++ b/worlds/civ_6/__init__.py
@@ -13,19 +13,6 @@ from .Options import CivVIOptions
 from .Regions import create_regions
 from BaseClasses import Item, ItemClassification, MultiWorld, Tutorial
 from worlds.AutoWorld import World, WebWorld
-from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, launch_subprocess
-
-
-def run_client(url: Optional[str] = None):
-    print("Running Civ6 Client")
-    from .Civ6Client import main  # lazy import
-    launch_subprocess(main, name="Civ6Client")
-
-
-components.append(
-    Component("Civ6 Client", func=run_client, component_type=Type.CLIENT,
-              file_identifier=SuffixIdentifier(".apcivvi"))
-)
 
 
 class CivVIWeb(WebWorld):