diff --git a/src/nu-git-manager-sugar/git-prompt.nu b/src/nu-git-manager-sugar/git-prompt.nu
deleted file mode 100644
index 0eeb441c..00000000
--- a/src/nu-git-manager-sugar/git-prompt.nu
+++ /dev/null
@@ -1,257 +0,0 @@
-const DEFAULT_PROMPT_INDICATORS = {
-    plain: "> ",
-    vi: {insert: ": ", normal: "> "}
-}
-
-# TODO: write a test
-def simplify-path []: path -> string {
-    str replace $nu.home-path "~" | str replace --regex '^/' "!/"
-}
-
-def color [color]: string -> string {
-    $"(ansi $color)($in)(ansi reset)"
-}
-
-# give the revision of the repo you're in
-#
-# in the output, $.type is guaranteed to be one of
-# - "branch"
-# - "tag"
-# - "detached"
-#
-# # Examples
-#     when on a branch
-#     > get-revision # would show the same even if the current branch commit is tagged
-#     ╭──────┬──────────────────────────────────────────╮
-#     │ name │ main                                     │
-#     │ hash │ fa3c06510b3250f4a901db2e9a026a45c971b518 │
-#     │ type │ branch                                   │
-#     ╰──────┴──────────────────────────────────────────╯
-#
-#     when on a tag
-#     > get-revision
-#     ╭──────┬──────────────────────────────────────────╮
-#     │ name │ 1.2.3                                    │
-#     │ hash │ fa3c06510b3250f4a901db2e9a026a45c971b518 │
-#     │ type │ tag                                      │
-#     ╰──────┴──────────────────────────────────────────╯
-#
-#     when the HEAD is detached
-#     > get-revision
-#     ╭──────┬──────────────────────────────────────────╮
-#     │ name │                                          │
-#     │ hash │ fa3c06510b3250f4a901db2e9a026a45c971b518 │
-#     │ type │ detached                                 │
-#     ╰──────┴──────────────────────────────────────────╯
-#
-#     when the HEAD is detached (short-version)
-#     > get-revision --short-hash
-#     ╭──────┬──────────╮
-#     │ name │          │
-#     │ hash │ fa3c0651 │
-#     │ type │ detached │
-#     ╰──────┴──────────╯
-# TODO: write a test
-def get-revision [
-    --short-hash: bool  # print the hash of a detached HEAD in short format
-]: nothing -> record<name: string, hash: string, type: string> {
-    let tag = do -i {
-        ^git describe HEAD --tags
-    } | complete
-    let is_tag = $tag.exit_code == 0 and (
-        $tag.stdout
-            | str trim
-            | parse --regex '(?<tag>.*)-(?<n>\d+)-(?<hash>[0-9a-fg]+)'
-            | is-empty
-    )
-
-    let branch = ^git branch --show-current
-    let hash = if $short_hash {
-        (^git rev-parse --short HEAD)
-    } else {
-        (^git rev-parse HEAD)
-    }
-
-    if not ($branch | is-empty) {
-        {name: $branch, hash: $hash, type: "branch"}
-    } else if $is_tag {
-        {name: ($tag.stdout | str trim), hash: $hash, type: "tag"}
-    } else {
-        {name: null, hash: $hash, type: "detached"}
-    }
-}
-
-# https://stackoverflow.com/questions/59603312/git-how-can-i-easily-tell-if-im-in-the-middle-of-a-rebase
-# TODO: write a test
-def git-action []: nothing -> string {
-    let git_dir = ^git rev-parse --git-dir | path expand
-
-    def test-dir [target: string]: nothing -> bool {
-        ($git_dir | path join $target | path type) == "dir"
-    }
-
-    def test-file [target: string]: nothing -> bool {
-        ($git_dir | path join $target | path type) == "file"
-    }
-
-    if (test-dir "rebase-merge") {
-        if (test-file "rebase-merge/interactive") {
-            "REBASE-i" | color blue
-        } else {
-            "REBASE-m" | color magenta
-        }
-    } else {
-        if (test-dir "rebase-apply") {
-            if (test-file "rebase-apply/rebasing") {
-                "REBASE" | color cyan
-            } else if (test-file "rebase-apply/applying") {
-                "AM" | color cyan
-            } else {
-                "AM/REBASE" | color cyan
-            }
-        } else if (test-file "MERGE_HEAD") {
-            "MERGING" | color dark_gray
-        } else if (test-file "CHERRY_PICK_HEAD") {
-            "CHERRY-PICKING" | color green
-        } else if (test-file "REVERT_HEAD") {
-            "REVERTING" | color red
-        } else if (test-file "BISECT_LOG") {
-            "BISECTING" | color yellow
-        } else {
-            null
-        }
-    }
-}
-
-# TODO: write a test
-def get-left-prompt [duration_threshold: duration]: nothing -> string {
-    let is_git_repo = not (
-        do --ignore-errors { ^git rev-parse --is-inside-work-tree } | is-empty
-    )
-
-    let pwd = if $is_git_repo {
-        let repo_root = (
-            ^git rev-parse --show-toplevel
-        )
-        let repo = $repo_root | path basename | color "magenta_bold"
-        let sub_dir = pwd
-            | str replace $repo_root ''
-            | str trim --char (char path_sep)
-            | simplify-path
-
-        if $sub_dir != "" {
-            [$repo, ($sub_dir | color "magenta_dimmed")]
-                | str join (char path_sep | color "magenta_dimmed")
-        } else {
-            $repo
-        }
-    } else {
-        pwd | simplify-path | color "green"
-    }
-
-    let git_branch_segment = if $is_git_repo {
-        let revision = get-revision --short-hash true
-        let pretty_branch_tokens = match $revision.type {
-            "branch" => [
-                ($revision.name | color {fg: "yellow", attr: "ub"}),
-                ($revision.hash | color "yellow_dimmed")
-            ],
-            "tag" => [
-                ($revision.name | color {fg: "blue", attr: "ub"}),
-                ($revision.hash | color "blue_dimmed")
-            ],
-            "detached" => ["_", ($revision.hash | color "default_dimmed")]
-        }
-
-        $"\(($pretty_branch_tokens | str join ":")\)"
-    } else {
-        null
-    }
-
-    let git_action_segment = if $is_git_repo {
-        let action = git-action
-        if $action != null {
-            $"\(($action)\)"
-        } else {
-            null
-        }
-    } else {
-        null
-    }
-
-    let admin_segment = if (is-admin) {
-        "!!" | color "red_bold"
-    } else {
-        null
-    }
-
-    let command_failed_segment = if $env.LAST_EXIT_CODE != 0 {
-        $env.LAST_EXIT_CODE | color "red_bold"
-    } else {
-        null
-    }
-
-    let cmd_duration = $env.CMD_DURATION_MS | into int | $in * 1ms
-    let duration_segment = if $cmd_duration > $duration_threshold {
-        $cmd_duration | color "light_yellow"
-    } else {
-        null
-    }
-
-    let login_segment = if $nu.is-login {
-        "l" | color "cyan"
-    } else {
-        ""
-    }
-
-    let segments = [
-        $admin_segment,
-        $pwd,
-        $git_branch_segment,
-        $git_action_segment,
-        $duration_segment,
-        $command_failed_segment,
-        $login_segment,
-    ]
-
-    $segments | compact | str join " "
-}
-
-# setup the Git prompt of NGM
-#
-# the different sections of the prompt are the following, in order and separated by a single space:
-# - "admin_segment": shows if you are an admin of the session
-# - "pwd": shows the current working directory, in long form outside of a repo or with only the
-#     basename if inside a Git repo
-# - "git_branch_segment": if inside a Git repo, will show the current branch, the tag or the
-#     detached revision
-# - "git_action_segment": if inside a Git repo and performing a Git action, such as a MERGE or a
-#     REBASE, the prompt will show the stage of the action
-# - "duration_segment": if the last command took longer than the `--duration-threshold`, the prompt
-#     will show the exact duration
-# - "command_failed_segment": if the last command failed, the exit code will be shown
-# - "login_segment": shows if you are in a login session
-#
-# # Examples
-#     setup the prompt with 10sec of command duration and `> ` as the Vi indicator
-#     > export-env {
-#           use nu-git-manager-sugar git-prompt setup
-#           setup --duration-threshold 10sec --indicators {
-#               vi: {
-#                   insert: "> "
-#                   normal: "> "
-#               }
-#           }
-#       }
-export def --env setup [
-    --indicators = $DEFAULT_PROMPT_INDICATORS,
-    --duration-threshold: duration = 1sec  # the threshold above which the command duration is shown
-] {
-    $env.PROMPT_COMMAND = { get-left-prompt $duration_threshold }
-    $env.PROMPT_COMMAND_RIGHT = ""
-
-    let indicators = $DEFAULT_PROMPT_INDICATORS | merge $indicators
-    $env.PROMPT_INDICATOR = $indicators.plain
-    $env.PROMPT_INDICATOR_VI_INSERT = $indicators.vi.insert
-    $env.PROMPT_INDICATOR_VI_NORMAL = $indicators.vi.normal
-}
diff --git a/src/nu-git-manager-sugar/git/lib/lib.nu b/src/nu-git-manager-sugar/git/lib/lib.nu
new file mode 100644
index 00000000..494f14d0
--- /dev/null
+++ b/src/nu-git-manager-sugar/git/lib/lib.nu
@@ -0,0 +1,111 @@
+# give the revision of the repo you're in
+#
+# in the output, $.type is guaranteed to be one of
+# - "branch"
+# - "tag"
+# - "detached"
+#
+# # Examples
+#     when on a branch
+#     > get-revision # would show the same even if the current branch commit is tagged
+#     ╭──────┬──────────────────────────────────────────╮
+#     │ name │ main                                     │
+#     │ hash │ fa3c06510b3250f4a901db2e9a026a45c971b518 │
+#     │ type │ branch                                   │
+#     ╰──────┴──────────────────────────────────────────╯
+#
+#     when on a tag
+#     > get-revision
+#     ╭──────┬──────────────────────────────────────────╮
+#     │ name │ 1.2.3                                    │
+#     │ hash │ fa3c06510b3250f4a901db2e9a026a45c971b518 │
+#     │ type │ tag                                      │
+#     ╰──────┴──────────────────────────────────────────╯
+#
+#     when the HEAD is detached
+#     > get-revision
+#     ╭──────┬──────────────────────────────────────────╮
+#     │ name │                                          │
+#     │ hash │ fa3c06510b3250f4a901db2e9a026a45c971b518 │
+#     │ type │ detached                                 │
+#     ╰──────┴──────────────────────────────────────────╯
+#
+#     when the HEAD is detached (short-version)
+#     > get-revision --short-hash
+#     ╭──────┬──────────╮
+#     │ name │          │
+#     │ hash │ fa3c0651 │
+#     │ type │ detached │
+#     ╰──────┴──────────╯
+# TODO: write a test
+export def get-revision [
+    --short-hash: bool  # print the hash of a detached HEAD in short format
+]: nothing -> record<name: string, hash: string, type: string> {
+    let tag = do -i {
+        ^git describe HEAD --tags
+    } | complete
+    let is_tag = $tag.exit_code == 0 and (
+        $tag.stdout
+            | str trim
+            | parse --regex '(?<tag>.*)-(?<n>\d+)-(?<hash>[0-9a-fg]+)'
+            | is-empty
+    )
+
+    let branch = ^git branch --show-current
+    let hash = if $short_hash {
+        (^git rev-parse --short HEAD)
+    } else {
+        (^git rev-parse HEAD)
+    }
+
+    if not ($branch | is-empty) {
+        {name: $branch, hash: $hash, type: "branch"}
+    } else if $is_tag {
+        {name: ($tag.stdout | str trim), hash: $hash, type: "tag"}
+    } else {
+        {name: null, hash: $hash, type: "detached"}
+    }
+}
+
+# https://stackoverflow.com/questions/59603312/git-how-can-i-easily-tell-if-im-in-the-middle-of-a-rebase
+# TODO: write a test
+export def git-action []: nothing -> string {
+    let git_dir = ^git rev-parse --git-dir | path expand
+
+    def test-dir [target: string]: nothing -> bool {
+        ($git_dir | path join $target | path type) == "dir"
+    }
+
+    def test-file [target: string]: nothing -> bool {
+        ($git_dir | path join $target | path type) == "file"
+    }
+
+    if (test-dir "rebase-merge") {
+        if (test-file "rebase-merge/interactive") {
+            "REBASE-i" | color blue
+        } else {
+            "REBASE-m" | color magenta
+        }
+    } else {
+        if (test-dir "rebase-apply") {
+            if (test-file "rebase-apply/rebasing") {
+                "REBASE" | color cyan
+            } else if (test-file "rebase-apply/applying") {
+                "AM" | color cyan
+            } else {
+                "AM/REBASE" | color cyan
+            }
+        } else if (test-file "MERGE_HEAD") {
+            "MERGING" | color dark_gray
+        } else if (test-file "CHERRY_PICK_HEAD") {
+            "CHERRY-PICKING" | color green
+        } else if (test-file "REVERT_HEAD") {
+            "REVERTING" | color red
+        } else if (test-file "BISECT_LOG") {
+            "BISECTING" | color yellow
+        } else {
+            null
+        }
+    }
+}
+
diff --git a/src/nu-git-manager-sugar/git/lib/prompt.nu b/src/nu-git-manager-sugar/git/lib/prompt.nu
new file mode 100644
index 00000000..2604637a
--- /dev/null
+++ b/src/nu-git-manager-sugar/git/lib/prompt.nu
@@ -0,0 +1,103 @@
+# TODO: write a test
+def simplify-path []: path -> string {
+    str replace $nu.home-path "~" | str replace --regex '^/' "!/"
+}
+
+def color [color]: string -> string {
+    $"(ansi $color)($in)(ansi reset)"
+}
+
+# TODO: write a test
+export def get-left-prompt [duration_threshold: duration]: nothing -> string {
+    let is_git_repo = not (
+        do --ignore-errors { ^git rev-parse --is-inside-work-tree } | is-empty
+    )
+
+    let pwd = if $is_git_repo {
+        let repo_root = (
+            ^git rev-parse --show-toplevel
+        )
+        let repo = $repo_root | path basename | color "magenta_bold"
+        let sub_dir = pwd
+            | str replace $repo_root ''
+            | str trim --char (char path_sep)
+            | simplify-path
+
+        if $sub_dir != "" {
+            [$repo, ($sub_dir | color "magenta_dimmed")]
+                | str join (char path_sep | color "magenta_dimmed")
+        } else {
+            $repo
+        }
+    } else {
+        pwd | simplify-path | color "green"
+    }
+
+    let git_branch_segment = if $is_git_repo {
+        let revision = get-revision --short-hash true
+        let pretty_branch_tokens = match $revision.type {
+            "branch" => [
+                ($revision.name | color {fg: "yellow", attr: "ub"}),
+                ($revision.hash | color "yellow_dimmed")
+            ],
+            "tag" => [
+                ($revision.name | color {fg: "blue", attr: "ub"}),
+                ($revision.hash | color "blue_dimmed")
+            ],
+            "detached" => ["_", ($revision.hash | color "default_dimmed")]
+        }
+
+        $"\(($pretty_branch_tokens | str join ":")\)"
+    } else {
+        null
+    }
+
+    let git_action_segment = if $is_git_repo {
+        let action = git-action
+        if $action != null {
+            $"\(($action)\)"
+        } else {
+            null
+        }
+    } else {
+        null
+    }
+
+    let admin_segment = if (is-admin) {
+        "!!" | color "red_bold"
+    } else {
+        null
+    }
+
+    let command_failed_segment = if $env.LAST_EXIT_CODE != 0 {
+        $env.LAST_EXIT_CODE | color "red_bold"
+    } else {
+        null
+    }
+
+    let cmd_duration = $env.CMD_DURATION_MS | into int | $in * 1ms
+    let duration_segment = if $cmd_duration > $duration_threshold {
+        $cmd_duration | color "light_yellow"
+    } else {
+        null
+    }
+
+    let login_segment = if $nu.is-login {
+        "l" | color "cyan"
+    } else {
+        ""
+    }
+
+    let segments = [
+        $admin_segment,
+        $pwd,
+        $git_branch_segment,
+        $git_action_segment,
+        $duration_segment,
+        $command_failed_segment,
+        $login_segment,
+    ]
+
+    $segments | compact | str join " "
+}
+
diff --git a/src/nu-git-manager-sugar/git.nu b/src/nu-git-manager-sugar/git/mod.nu
similarity index 100%
rename from src/nu-git-manager-sugar/git.nu
rename to src/nu-git-manager-sugar/git/mod.nu
diff --git a/src/nu-git-manager-sugar/git/prompt.nu b/src/nu-git-manager-sugar/git/prompt.nu
new file mode 100644
index 00000000..3d05115e
--- /dev/null
+++ b/src/nu-git-manager-sugar/git/prompt.nu
@@ -0,0 +1,46 @@
+use ../git/lib/lib.nu [get-revision, git-action]
+use ../git/lib/prompt.nu [get-left-prompt]
+
+const DEFAULT_PROMPT_INDICATORS = {
+    plain: "> ",
+    vi: {insert: ": ", normal: "> "}
+}
+
+# setup the Git prompt of NGM
+#
+# the different sections of the prompt are the following, in order and separated by a single space:
+# - "admin_segment": shows if you are an admin of the session
+# - "pwd": shows the current working directory, in long form outside of a repo or with only the
+#     basename if inside a Git repo
+# - "git_branch_segment": if inside a Git repo, will show the current branch, the tag or the
+#     detached revision
+# - "git_action_segment": if inside a Git repo and performing a Git action, such as a MERGE or a
+#     REBASE, the prompt will show the stage of the action
+# - "duration_segment": if the last command took longer than the `--duration-threshold`, the prompt
+#     will show the exact duration
+# - "command_failed_segment": if the last command failed, the exit code will be shown
+# - "login_segment": shows if you are in a login session
+#
+# # Examples
+#     setup the prompt with 10sec of command duration and `> ` as the Vi indicator
+#     > export-env {
+#           use nu-git-manager-sugar git-prompt setup
+#           setup --duration-threshold 10sec --indicators {
+#               vi: {
+#                   insert: "> "
+#                   normal: "> "
+#               }
+#           }
+#       }
+export def --env setup [
+    --indicators = $DEFAULT_PROMPT_INDICATORS,
+    --duration-threshold: duration = 1sec  # the threshold above which the command duration is shown
+] {
+    $env.PROMPT_COMMAND = { get-left-prompt $duration_threshold }
+    $env.PROMPT_COMMAND_RIGHT = ""
+
+    let indicators = $DEFAULT_PROMPT_INDICATORS | merge $indicators
+    $env.PROMPT_INDICATOR = $indicators.plain
+    $env.PROMPT_INDICATOR_VI_INSERT = $indicators.vi.insert
+    $env.PROMPT_INDICATOR_VI_NORMAL = $indicators.vi.normal
+}