From b06b9ab8a2c892871d74353fa80aa0bb3b0597ff Mon Sep 17 00:00:00 2001
From: jem <michael.jerger@meissa-gmbh.de>
Date: Tue, 18 Jan 2022 20:10:18 +0100
Subject: [PATCH] refactor: *.k3s -> server

---
 .idea-configs/cli-MyIdeConfig.yaml.run.xml          |  2 +-
 .../application/Application.kt                      |  6 +++---
 .../application/CliWorkplace.kt                     |  4 ++--
 .../application/CliWorkplaceCommand.kt              |  2 +-
 .../application/CliWorkplaceParser.kt               |  2 +-
 .../domain/ProvisionWorkplace.kt                    |  4 ++--
 .../domain/WorkplaceConfig.kt                       |  2 +-
 .../provs/desktop/domain/WorkplaceType.kt           |  5 +++++
 .../{workplace => desktop}/infrastructure/Bash.kt   |  2 +-
 .../infrastructure/ConfigRepository.kt              |  4 ++--
 .../{workplace => desktop}/infrastructure/DevOps.kt |  2 +-
 .../{workplace => desktop}/infrastructure/Docker.kt |  2 +-
 .../infrastructure/Fakturama.kt                     |  2 +-
 .../{workplace => desktop}/infrastructure/Gopass.kt |  2 +-
 .../infrastructure/GopassBridge.kt                  |  2 +-
 .../infrastructure/IntelliJ.kt                      |  2 +-
 .../infrastructure/NoSwappiness.kt                  |  2 +-
 .../infrastructure/PackageBundles.kt                |  2 +-
 .../{workplace => desktop}/infrastructure/Python.kt |  2 +-
 .../infrastructure/Redshift.kt                      |  2 +-
 .../{workplace => desktop}/infrastructure/VSCode.kt |  2 +-
 .../infrastructure/VirtualBoxGuest.kt               |  2 +-
 .../{workplace => desktop}/infrastructure/Zim.kt    |  2 +-
 .../server_software/k3s/application/Application.kt  | 13 -------------
 .../k3s/infrastructure => server}/apple/Apple.kt    |  6 +++---
 .../provs/server/application/Application.kt         | 13 +++++++++++++
 .../k3s => server}/application/Cli.kt               |  4 ++--
 .../application/CliK3sArgumentsParser.kt            |  2 +-
 .../k3s => server}/application/CliK3sCommand.kt     |  2 +-
 .../server_software/k3s => server}/domain/K3d.kt    |  2 +-
 .../server_software/k3s => server}/domain/K3s.kt    |  2 +-
 .../provs/workplace/domain/WorkplaceType.kt         |  5 -----
 .../application/CliWorkplaceKtTest.kt               | 11 +++++------
 .../infrastructure/ConfigRepositoryKtTest.kt        |  4 ++--
 .../infrastructure/DevOpsKtTest.kt                  |  2 +-
 .../infrastructure/PythonKtTest.kt                  |  2 +-
 .../infrastructure/VSCodeKtTest.kt                  |  2 +-
 .../workplace/ProvisionWorkplaceKtTest.kt           |  6 +++---
 .../extensions/workplace/base/FakturamaKtTest.kt    |  2 +-
 .../extensions/workplace/base/GopassBridgeKtTest.kt |  8 ++++----
 .../extensions/workplace/base/GopassKtTest.kt       |  2 +-
 .../extensions/workplace/base/VSCodeKtTest.kt       |  2 +-
 .../application/CliK3sCommandKtTest.kt              |  4 +++-
 .../k3s => server}/application/CliKtTest.kt         |  3 ++-
 .../k3s => server}/domain/K3dKtTest.kt              |  6 +++---
 45 files changed, 82 insertions(+), 80 deletions(-)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/application/Application.kt (56%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/application/CliWorkplace.kt (90%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/application/CliWorkplaceCommand.kt (80%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/application/CliWorkplaceParser.kt (93%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/domain/ProvisionWorkplace.kt (96%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/domain/WorkplaceConfig.kt (85%)
 create mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/WorkplaceType.kt
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/Bash.kt (94%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/ConfigRepository.kt (90%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/DevOps.kt (98%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/Docker.kt (83%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/Fakturama.kt (91%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/Gopass.kt (98%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/GopassBridge.kt (98%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/IntelliJ.kt (70%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/NoSwappiness.kt (82%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/PackageBundles.kt (88%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/Python.kt (93%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/Redshift.kt (91%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/VSCode.kt (97%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/VirtualBoxGuest.kt (93%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/Zim.kt (90%)
 delete mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Application.kt
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{framework/extensions/server_software/k3s/infrastructure => server}/apple/Apple.kt (85%)
 create mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{framework/extensions/server_software/k3s => server}/application/Cli.kt (79%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{framework/extensions/server_software/k3s => server}/application/CliK3sArgumentsParser.kt (81%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{framework/extensions/server_software/k3s => server}/application/CliK3sCommand.kt (90%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{framework/extensions/server_software/k3s => server}/domain/K3d.kt (95%)
 rename src/main/kotlin/org/domaindrivenarchitecture/provs/{framework/extensions/server_software/k3s => server}/domain/K3s.kt (94%)
 delete mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceType.kt
 rename src/test/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/application/CliWorkplaceKtTest.kt (91%)
 rename src/test/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/ConfigRepositoryKtTest.kt (91%)
 rename src/test/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/DevOpsKtTest.kt (95%)
 rename src/test/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/PythonKtTest.kt (86%)
 rename src/test/kotlin/org/domaindrivenarchitecture/provs/{workplace => desktop}/infrastructure/VSCodeKtTest.kt (88%)
 rename src/test/kotlin/org/domaindrivenarchitecture/provs/{framework/extensions/server_software/k3s => server}/application/CliK3sCommandKtTest.kt (84%)
 rename src/test/kotlin/org/domaindrivenarchitecture/provs/{framework/extensions/server_software/k3s => server}/application/CliKtTest.kt (67%)
 rename src/test/kotlin/org/domaindrivenarchitecture/provs/{framework/extensions/server_software/k3s => server}/domain/K3dKtTest.kt (87%)

diff --git a/.idea-configs/cli-MyIdeConfig.yaml.run.xml b/.idea-configs/cli-MyIdeConfig.yaml.run.xml
index 7354a10..003b3c4 100644
--- a/.idea-configs/cli-MyIdeConfig.yaml.run.xml
+++ b/.idea-configs/cli-MyIdeConfig.yaml.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli-MyIdeConfig.yaml" type="Application" factoryName="Application">
     <option name="ALTERNATIVE_JRE_PATH" value="Kotlin SDK" />
-    <option name="MAIN_CLASS_NAME" value="org.domaindrivenarchitecture.provs.workplace.application.CliKt" />
+    <option name="MAIN_CLASS_NAME" value="org.domaindrivenarchitecture.provs.desktop.application.CliKt" />
     <module name="provs.main" />
     <option name="PROGRAM_PARAMETERS" value="MyIdeConfig.yaml" />
     <method v="2">
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/Application.kt
similarity index 56%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/Application.kt
index 1dbf998..3a055ea 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/Application.kt
@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.workplace.domain.provisionWorkplace
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.provisionWorkplace
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceConfig
 
 /**
  * Use case for provisioning a workplace
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplace.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplace.kt
similarity index 90%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplace.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplace.kt
index 2092cf3..ba2dd5b 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplace.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplace.kt
@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import kotlinx.serialization.SerializationException
 import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.getConfig
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.getConfig
 import java.io.FileNotFoundException
 import kotlin.system.exitProcess
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceCommand.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceCommand.kt
similarity index 80%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceCommand.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceCommand.kt
index 15e5b91..1ad5c62 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceCommand.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceCommand.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceParser.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceParser.kt
similarity index 93%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceParser.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceParser.kt
index 1588fae..30cadb3 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceParser.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceParser.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import kotlinx.cli.ArgType
 import kotlinx.cli.optional
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/ProvisionWorkplace.kt
similarity index 96%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/ProvisionWorkplace.kt
index bba2c68..9cd88a7 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/ProvisionWorkplace.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.domain
+package org.domaindrivenarchitecture.provs.desktop.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
@@ -11,7 +11,7 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.gpgFingerpr
 import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.provisionKeys
 import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.currentUserCanSudo
 import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.whoami
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.*
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.*
 
 
 /**
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceConfig.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/WorkplaceConfig.kt
similarity index 85%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceConfig.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/WorkplaceConfig.kt
index 839ed7b..1632869 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceConfig.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/WorkplaceConfig.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.domain
+package org.domaindrivenarchitecture.provs.desktop.domain
 
 import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPairSource
 import kotlinx.serialization.Serializable
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/WorkplaceType.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/WorkplaceType.kt
new file mode 100644
index 0000000..19d8e4b
--- /dev/null
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/WorkplaceType.kt
@@ -0,0 +1,5 @@
+package org.domaindrivenarchitecture.provs.desktop.domain
+
+enum class WorkplaceType {
+    MINIMAL, OFFICE, IDE
+}
\ No newline at end of file
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Bash.kt
similarity index 94%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Bash.kt
index 28bfdb4..60e6560 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Bash.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepository.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/ConfigRepository.kt
similarity index 90%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepository.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/ConfigRepository.kt
index 5c96f21..81ef257 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepository.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/ConfigRepository.kt
@@ -1,9 +1,9 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import com.charleskorn.kaml.Yaml
 import kotlinx.serialization.json.Json
 import org.domaindrivenarchitecture.provs.framework.core.tags.Api
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceConfig
 import java.io.BufferedReader
 import java.io.FileReader
 import java.io.FileWriter
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/DevOps.kt
similarity index 98%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/DevOps.kt
index abcc81c..d5467f2 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/DevOps.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Docker.kt
similarity index 83%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Docker.kt
index 943baaf..83c0325 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Docker.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Fakturama.kt
similarity index 91%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Fakturama.kt
index 6888dfa..a92c3d0 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Fakturama.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Gopass.kt
similarity index 98%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Gopass.kt
index 0aafbf3..c917cb0 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Gopass.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt
similarity index 98%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt
index 79a0009..393f94c 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/IntelliJ.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/IntelliJ.kt
similarity index 70%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/IntelliJ.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/IntelliJ.kt
index 163e39f..5ce591a 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/IntelliJ.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/IntelliJ.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/NoSwappiness.kt
similarity index 82%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/NoSwappiness.kt
index 4790a63..2c0d5f0 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/NoSwappiness.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.addTextToFile
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/PackageBundles.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PackageBundles.kt
similarity index 88%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/PackageBundles.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PackageBundles.kt
index be88fcb..74bbdf4 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/PackageBundles.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PackageBundles.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 val KEY_MANAGEMENT = "ssh gnupg"
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Python.kt
similarity index 93%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Python.kt
index 66500f4..b1f7756 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Python.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Redshift.kt
similarity index 91%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Redshift.kt
index e30ade7..2f5e5e2 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Redshift.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCode.kt
similarity index 97%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCode.kt
index 299d661..348b77b 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCode.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VirtualBoxGuest.kt
similarity index 93%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VirtualBoxGuest.kt
index 8fa4e53..650a214 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VirtualBoxGuest.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Zim.kt
similarity index 90%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Zim.kt
index 745d0f2..38e81ab 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Zim.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Application.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Application.kt
deleted file mode 100644
index 84bfe63..0000000
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Application.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
-
-import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.installK3sServer
-
-
-/**
- * Performs use case of provisioning a k3s server
- */
-fun Prov.provisionK3s() = task {
-    installK3sServer()
-}
-
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/infrastructure/apple/Apple.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/apple/Apple.kt
similarity index 85%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/infrastructure/apple/Apple.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/server/apple/Apple.kt
index 42e7f73..0b1125a 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/infrastructure/apple/Apple.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/apple/Apple.kt
@@ -1,11 +1,11 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple
+package org.domaindrivenarchitecture.provs.server.apple
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
 import org.domaindrivenarchitecture.provs.framework.core.remote
 import org.domaindrivenarchitecture.provs.framework.core.repeatTaskUntilSuccess
-import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.applyK3sConfig
-import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.installK3sServer
+import org.domaindrivenarchitecture.provs.server.domain.applyK3sConfig
+import org.domaindrivenarchitecture.provs.server.domain.installK3sServer
 
 
 /**
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt
new file mode 100644
index 0000000..8414db2
--- /dev/null
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt
@@ -0,0 +1,13 @@
+package org.domaindrivenarchitecture.provs.server.application
+
+import org.domaindrivenarchitecture.provs.framework.core.Prov
+import org.domaindrivenarchitecture.provs.server.domain.installK3sServer
+
+
+/**
+ * Performs use case of provisioning a k3s server
+ */
+fun Prov.provisionK3s() = task {
+    installK3sServer()
+}
+
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Cli.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Cli.kt
similarity index 79%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Cli.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Cli.kt
index 30422d2..5f19223 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Cli.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Cli.kt
@@ -1,7 +1,7 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
 import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance
-import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.installK3sAsContainers
+import org.domaindrivenarchitecture.provs.server.domain.installK3sAsContainers
 import kotlin.system.exitProcess
 
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sArgumentsParser.kt
similarity index 81%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sArgumentsParser.kt
index 5ec7138..0266134 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sArgumentsParser.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
 import kotlinx.cli.ArgType
 import kotlinx.cli.default
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommand.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sCommand.kt
similarity index 90%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommand.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sCommand.kt
index 6aeafd5..697f6ec 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommand.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sCommand.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
 import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3d.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3d.kt
similarity index 95%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3d.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3d.kt
index 6e0799a..37e683a 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3d.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3d.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain
+package org.domaindrivenarchitecture.provs.server.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3s.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3s.kt
similarity index 94%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3s.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3s.kt
index 09869a4..c60fa1d 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3s.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3s.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain
+package org.domaindrivenarchitecture.provs.server.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceType.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceType.kt
deleted file mode 100644
index 542caf9..0000000
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceType.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.domaindrivenarchitecture.provs.workplace.domain
-
-enum class WorkplaceType {
-    MINIMAL, OFFICE, IDE
-}
\ No newline at end of file
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceKtTest.kt
similarity index 91%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceKtTest.kt
index 22358ab..ea60ed0 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceKtTest.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import ch.qos.logback.classic.Level
 import io.mockk.every
@@ -8,12 +8,11 @@ import io.mockk.verify
 import org.domaindrivenarchitecture.provs.framework.core.*
 import org.domaindrivenarchitecture.provs.framework.core.cli.retrievePassword
 import org.domaindrivenarchitecture.provs.framework.core.processors.PrintOnlyProcessor
-import org.domaindrivenarchitecture.provs.framework.core.*
 import org.domaindrivenarchitecture.provs.test.setRootLoggingLevel
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType
-import org.domaindrivenarchitecture.provs.workplace.domain.provisionWorkplace
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.getConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceType
+import org.domaindrivenarchitecture.provs.desktop.domain.provisionWorkplace
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.getConfig
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepositoryKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/ConfigRepositoryKtTest.kt
similarity index 91%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepositoryKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/ConfigRepositoryKtTest.kt
index 1c81324..6817a60 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepositoryKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/ConfigRepositoryKtTest.kt
@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import com.charleskorn.kaml.InvalidPropertyValueException
 import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSourceType
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/DevOpsKtTest.kt
similarity index 95%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/DevOpsKtTest.kt
index 41dbfd4..8dcd410 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/DevOpsKtTest.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.getResourceAsText
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/PythonKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PythonKtTest.kt
similarity index 86%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/PythonKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PythonKtTest.kt
index d91a514..36d37b6 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/PythonKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PythonKtTest.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCodeKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCodeKtTest.kt
similarity index 88%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCodeKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCodeKtTest.kt
index 2b91406..8e704ce 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCodeKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCodeKtTest.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/ProvisionWorkplaceKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/ProvisionWorkplaceKtTest.kt
index c6dc180..a00187d 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/ProvisionWorkplaceKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/ProvisionWorkplaceKtTest.kt
@@ -2,9 +2,9 @@ package org.domaindrivenarchitecture.provs.framework.extensions.workplace
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType
-import org.domaindrivenarchitecture.provs.workplace.domain.provisionWorkplace
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.getConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceType
+import org.domaindrivenarchitecture.provs.desktop.domain.provisionWorkplace
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.getConfig
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/FakturamaKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/FakturamaKtTest.kt
index 771eabd..faab262 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/FakturamaKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/FakturamaKtTest.kt
@@ -2,7 +2,7 @@ package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.installFakturama
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.installFakturama
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassBridgeKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassBridgeKtTest.kt
index f9c6a6c..6792b32 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassBridgeKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassBridgeKtTest.kt
@@ -17,10 +17,10 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.privateGPGSnakeoilKey
 import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.publicGPGSnakeoilKey
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.configureGopassBridgeJsonApi
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.downloadGopassBridge
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.installGopass
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.installGopassBridgeJsonApi
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.configureGopassBridgeJsonApi
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.downloadGopassBridge
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.installGopass
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.installGopassBridgeJsonApi
 
 
 internal class GopassBridgeKtTest {
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt
index 3673521..9816565 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt
@@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test
 import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.privateGPGSnakeoilKey
 import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.publicGPGSnakeoilKey
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.*
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.*
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.*
 import org.junit.jupiter.api.Assertions.assertFalse
 
 
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/VSCodeKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/VSCodeKtTest.kt
index 49368d1..26c6220 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/VSCodeKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/VSCodeKtTest.kt
@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.installVSC
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.installVSC
 
 
 internal class VSCodeKtTest {
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sCommandKtTest.kt
similarity index 84%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sCommandKtTest.kt
index 192392f..6ed2d35 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sCommandKtTest.kt
@@ -1,5 +1,7 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
+import org.domaindrivenarchitecture.provs.server.application.CliK3sArgumentsParser
+import org.domaindrivenarchitecture.provs.server.application.parseServerArguments
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Assertions.*
 
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/application/CliKtTest.kt
similarity index 67%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/server/application/CliKtTest.kt
index a01b3a9..99fb575 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/application/CliKtTest.kt
@@ -1,5 +1,6 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
+import org.domaindrivenarchitecture.provs.server.application.main
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3dKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3dKtTest.kt
similarity index 87%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3dKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3dKtTest.kt
index e43e9a3..29de71a 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3dKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3dKtTest.kt
@@ -1,12 +1,12 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain
+package org.domaindrivenarchitecture.provs.server.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.docker
 import org.domaindrivenarchitecture.provs.framework.core.docker.containerExec
 import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer
 import org.domaindrivenarchitecture.provs.framework.core.local
 import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode
-import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple.appleConfig
-import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple.checkAppleService
+import org.domaindrivenarchitecture.provs.server.apple.appleConfig
+import org.domaindrivenarchitecture.provs.server.apple.checkAppleService
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.NonCi
 import org.junit.jupiter.api.Assertions.assertTrue