diff --git a/cli/src/core/git.py b/cli/src/core/git.py
index b41b19b..aaacd2a 100644
--- a/cli/src/core/git.py
+++ b/cli/src/core/git.py
@@ -14,6 +14,7 @@ def git_push_service_directory(
     """
     try:
         repo = git.Repo(repo_root)
+        original_branch = repo.active_branch.name
 
         logger.info(f"Switching to branch '{branch_name}'...")
         # Create branch if it doesn't exist, then checkout
@@ -39,6 +40,7 @@ def git_push_service_directory(
         origin.push(refspec=f"{branch_name}:{branch_name}").raise_if_error()
 
         logger.info("Successfully pushed!")
+        logger.info(f"Switching to branch '{original_branch}'...")
 
     except Exception as e:
         logger.info(f"Git Operation Failed: {e}")
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/app/pyproject.toml.jinja b/templates/service/[[service_id]]-[[service_name_lower]]/app/pyproject.toml.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/app/pyproject.toml.jinja
rename to templates/service/[[service_id]]-[[service_name_lower]]/app/pyproject.toml.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/app/src/AGEBD-SERVICE-{{service_name_upper}}.py.jinja b/templates/service/[[service_id]]-[[service_name_lower]]/app/src/AGEBD-SERVICE-[[service_name_upper]].py.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/app/src/AGEBD-SERVICE-{{service_name_upper}}.py.jinja
rename to templates/service/[[service_id]]-[[service_name_lower]]/app/src/AGEBD-SERVICE-[[service_name_upper]].py.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/app/src/__init__.py b/templates/service/[[service_id]]-[[service_name_lower]]/app/src/__init__.py
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/app/src/__init__.py
rename to templates/service/[[service_id]]-[[service_name_lower]]/app/src/__init__.py
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/ioc/AGEBD-CPCL-{{service_name_upper}}_main.subs.jinja b/templates/service/[[service_id]]-[[service_name_lower]]/ioc/AGEBD-CPCL-[[service_name_upper]]_main.subs.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/ioc/AGEBD-CPCL-{{service_name_upper}}_main.subs.jinja
rename to templates/service/[[service_id]]-[[service_name_lower]]/ioc/AGEBD-CPCL-[[service_name_upper]]_main.subs.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja b/templates/service/[[service_id]]-[[service_name_lower]]/ioc/AGEBD-CPCL-[[service_name_upper]]_parameters.yaml.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja
rename to templates/service/[[service_id]]-[[service_name_lower]]/ioc/AGEBD-CPCL-[[service_name_upper]]_parameters.yaml.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/ioc/{{service_name_upper}}.template b/templates/service/[[service_id]]-[[service_name_lower]]/ioc/[[service_name_upper]].template
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/ioc/{{service_name_upper}}.template
rename to templates/service/[[service_id]]-[[service_name_lower]]/ioc/[[service_name_upper]].template
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/ioc/startup.script.jinja b/templates/service/[[service_id]]-[[service_name_lower]]/ioc/startup.script.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/ioc/startup.script.jinja
rename to templates/service/[[service_id]]-[[service_name_lower]]/ioc/startup.script.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/qt/{{service_name_upper}}.ui.jinja b/templates/service/[[service_id]]-[[service_name_lower]]/qt/[[service_name_upper]].ui.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/qt/{{service_name_upper}}.ui.jinja
rename to templates/service/[[service_id]]-[[service_name_lower]]/qt/[[service_name_upper]].ui.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/systemd/AGEBD-SERVICE-{{service_name_upper}}.service.jinja b/templates/service/[[service_id]]-[[service_name_lower]]/systemd/AGEBD-SERVICE-[[service_name_upper]].service.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/systemd/AGEBD-SERVICE-{{service_name_upper}}.service.jinja
rename to templates/service/[[service_id]]-[[service_name_lower]]/systemd/AGEBD-SERVICE-[[service_name_upper]].service.jinja