diff --git a/src/cmd/config.go b/src/cli/config.go
similarity index 97%
rename from src/cmd/config.go
rename to src/cli/config.go
index 79d1107e..33d89e5d 100644
--- a/src/cmd/config.go
+++ b/src/cli/config.go
@@ -2,7 +2,7 @@
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 
 */
-package cmd
+package cli
 
 import (
 	"github.com/spf13/cobra"
diff --git a/src/cmd/config_export.go b/src/cli/config_export.go
similarity index 99%
rename from src/cmd/config_export.go
rename to src/cli/config_export.go
index 7dccbec5..aaa47e19 100644
--- a/src/cmd/config_export.go
+++ b/src/cli/config_export.go
@@ -2,7 +2,7 @@
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 
 */
-package cmd
+package cli
 
 import (
 	"fmt"
diff --git a/src/cmd/config_export_image.go b/src/cli/config_export_image.go
similarity index 99%
rename from src/cmd/config_export_image.go
rename to src/cli/config_export_image.go
index 23c1f822..749ffe8b 100644
--- a/src/cmd/config_export_image.go
+++ b/src/cli/config_export_image.go
@@ -2,7 +2,7 @@
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 
 */
-package cmd
+package cli
 
 import (
 	"fmt"
diff --git a/src/cmd/config_get.go b/src/cli/config_get.go
similarity index 98%
rename from src/cmd/config_get.go
rename to src/cli/config_get.go
index 47bee7eb..0d9a8ab6 100644
--- a/src/cmd/config_get.go
+++ b/src/cli/config_get.go
@@ -2,7 +2,7 @@
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 
 */
-package cmd
+package cli
 
 import (
 	"fmt"
diff --git a/src/cmd/config_migrate.go b/src/cli/config_migrate.go
similarity index 99%
rename from src/cmd/config_migrate.go
rename to src/cli/config_migrate.go
index 00bc9227..6600da8a 100644
--- a/src/cmd/config_migrate.go
+++ b/src/cli/config_migrate.go
@@ -2,7 +2,7 @@
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 
 */
-package cmd
+package cli
 
 import (
 	"fmt"
diff --git a/src/cmd/prompt.go b/src/cli/prompt.go
similarity index 97%
rename from src/cmd/prompt.go
rename to src/cli/prompt.go
index e1d220bb..39b3a524 100644
--- a/src/cmd/prompt.go
+++ b/src/cli/prompt.go
@@ -2,7 +2,7 @@
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 
 */
-package cmd
+package cli
 
 import (
 	"github.com/spf13/cobra"
diff --git a/src/cmd/prompt_init.go b/src/cli/prompt_init.go
similarity index 99%
rename from src/cmd/prompt_init.go
rename to src/cli/prompt_init.go
index 34d860c0..41e65b9f 100644
--- a/src/cmd/prompt_init.go
+++ b/src/cli/prompt_init.go
@@ -2,7 +2,7 @@
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 
 */
-package cmd
+package cli
 
 import (
 	"fmt"
diff --git a/src/cmd/prompt_print.go b/src/cli/prompt_print.go
similarity index 98%
rename from src/cmd/prompt_print.go
rename to src/cli/prompt_print.go
index 8bb2fb8f..7a164bd4 100644
--- a/src/cmd/prompt_print.go
+++ b/src/cli/prompt_print.go
@@ -2,7 +2,7 @@
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 
 */
-package cmd
+package cli
 
 import (
 	"fmt"
@@ -90,7 +90,7 @@ var printCmd = &cobra.Command{
 		}
 		switch args[0] {
 		case "debug":
-			fmt.Print(eng.PrintDebug(Version))
+			fmt.Print(eng.PrintDebug(cliVersion))
 		case "primary":
 			fmt.Print(eng.PrintPrimary())
 		case "secondary":
diff --git a/src/cmd/root.go b/src/cli/root.go
similarity index 79%
rename from src/cmd/root.go
rename to src/cli/root.go
index 06980f0e..c188c256 100644
--- a/src/cmd/root.go
+++ b/src/cli/root.go
@@ -1,4 +1,4 @@
-package cmd
+package cli
 
 import (
 	"fmt"
@@ -9,8 +9,9 @@ import (
 
 // Version number of oh-my-posh
 var (
-	Version = "development"
-	config  string
+	config         string
+	displayVersion bool
+	cliVersion     string
 )
 
 var rootCmd = &cobra.Command{
@@ -25,11 +26,15 @@ on getting started, have a look at the docs at https://ohmyposh.dev`,
 			runInit(shell)
 			return
 		}
-		fmt.Println(Version)
+		if displayVersion {
+			fmt.Println(cliVersion)
+			return
+		}
 	},
 }
 
-func Execute() {
+func Execute(version string) {
+	cliVersion = version
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
@@ -45,5 +50,6 @@ var (
 func init() { // nolint:gochecknoinits
 	rootCmd.PersistentFlags().StringVarP(&config, "config", "c", "", "config (required)")
 	rootCmd.Flags().BoolVarP(&initialize, "init", "i", false, "init (deprecated)")
+	rootCmd.Flags().BoolVar(&displayVersion, "version", false, "version")
 	rootCmd.Flags().StringVarP(&shell, "shell", "s", "", "shell (deprecated)")
 }
diff --git a/src/cmd/version.go b/src/cli/version.go
similarity index 91%
rename from src/cmd/version.go
rename to src/cli/version.go
index 0a5dfa13..aa57e8fb 100644
--- a/src/cmd/version.go
+++ b/src/cli/version.go
@@ -2,7 +2,7 @@
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 
 */
-package cmd
+package cli
 
 import (
 	"fmt"
@@ -16,7 +16,7 @@ var versionCmd = &cobra.Command{
 	Short: "Print the version",
 	Long:  "Print oh-my-posh version and build information.",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println(Version)
+		fmt.Println(cliVersion)
 	},
 }
 
diff --git a/src/main.go b/src/main.go
index 3a8e7708..8065a0d7 100644
--- a/src/main.go
+++ b/src/main.go
@@ -1,7 +1,11 @@
 package main
 
-import "oh-my-posh/cmd"
+import "oh-my-posh/cli"
+
+var (
+	Version = "development"
+)
 
 func main() {
-	cmd.Execute()
+	cli.Execute(Version)
 }