diff --git a/hooks/quantum_utils.py b/hooks/quantum_utils.py
index 3dd8fa1b..3e96221f 100644
--- a/hooks/quantum_utils.py
+++ b/hooks/quantum_utils.py
@@ -1046,13 +1046,13 @@ def git_post_install(projects_yaml):
             os.remove(s['link'])
         os.symlink(s['src'], s['link'])
 
-    render('neutron_sudoers',
+    render('git/neutron_sudoers',
            '/etc/sudoers.d/neutron_sudoers', {}, perms=0o440)
-    render('cron.d/neutron-dhcp-agent-netns-cleanup',
+    render('git/cron.d/neutron-dhcp-agent-netns-cleanup',
            '/etc/cron.d/neutron-dhcp-agent-netns-cleanup', {}, perms=0o755)
-    render('cron.d/neutron-l3-agent-netns-cleanup',
+    render('git/cron.d/neutron-l3-agent-netns-cleanup',
            '/etc/cron.d/neutron-l3-agent-netns-cleanup', {}, perms=0o755)
-    render('cron.d/neutron-lbaas-agent-netns-cleanup',
+    render('git/cron.d/neutron-lbaas-agent-netns-cleanup',
            '/etc/cron.d/neutron-lbaas-agent-netns-cleanup', {}, perms=0o755)
 
     service_name = 'quantum-gateway'
@@ -1242,10 +1242,10 @@ def git_post_install(projects_yaml):
     # NOTE(coreycb): Needs systemd support
     templates_dir = 'hooks/charmhelpers/contrib/openstack/templates'
     templates_dir = os.path.join(charm_dir(), templates_dir)
-    render('upstart/neutron-agent.upstart',
+    render('git/upstart/neutron-agent.upstart',
            '/etc/init/neutron-dhcp-agent.conf',
            neutron_dhcp_agent_context, perms=0o644)
-    render('upstart/neutron-agent.upstart',
+    render('git/upstart/neutron-agent.upstart',
            '/etc/init/neutron-l3-agent.conf',
            neutron_l3_agent_context, perms=0o644)
     render('git.upstart',
@@ -1304,10 +1304,10 @@ def git_post_install(projects_yaml):
            '/etc/init/neutron-plugin-sriov-agent.conf',
            neutron_plugin_sriov_context, perms=0o644,
            templates_dir=templates_dir)
-    render('upstart/neutron-server.upstart',
+    render('git/upstart/neutron-server.upstart',
            '/etc/init/neutron-server.conf',
            neutron_api_context, perms=0o644)
-    render('upstart/neutron-agent.upstart',
+    render('git/upstart/neutron-agent.upstart',
            '/etc/init/neutron-vpn-agent.conf',
            neutron_vpn_agent_context, perms=0o644)
 
diff --git a/templates/cron.d/neutron-dhcp-agent-netns-cleanup b/templates/git/cron.d/neutron-dhcp-agent-netns-cleanup
similarity index 100%
rename from templates/cron.d/neutron-dhcp-agent-netns-cleanup
rename to templates/git/cron.d/neutron-dhcp-agent-netns-cleanup
diff --git a/templates/cron.d/neutron-l3-agent-netns-cleanup b/templates/git/cron.d/neutron-l3-agent-netns-cleanup
similarity index 100%
rename from templates/cron.d/neutron-l3-agent-netns-cleanup
rename to templates/git/cron.d/neutron-l3-agent-netns-cleanup
diff --git a/templates/cron.d/neutron-lbaas-agent-netns-cleanup b/templates/git/cron.d/neutron-lbaas-agent-netns-cleanup
similarity index 100%
rename from templates/cron.d/neutron-lbaas-agent-netns-cleanup
rename to templates/git/cron.d/neutron-lbaas-agent-netns-cleanup
diff --git a/templates/neutron_sudoers b/templates/git/neutron_sudoers
similarity index 100%
rename from templates/neutron_sudoers
rename to templates/git/neutron_sudoers
diff --git a/templates/upstart/neutron-agent.upstart b/templates/git/upstart/neutron-agent.upstart
similarity index 100%
rename from templates/upstart/neutron-agent.upstart
rename to templates/git/upstart/neutron-agent.upstart
diff --git a/templates/upstart/neutron-ovs-cleanup.upstart b/templates/git/upstart/neutron-ovs-cleanup.upstart
similarity index 100%
rename from templates/upstart/neutron-ovs-cleanup.upstart
rename to templates/git/upstart/neutron-ovs-cleanup.upstart
diff --git a/templates/upstart/neutron-server.upstart b/templates/git/upstart/neutron-server.upstart
similarity index 100%
rename from templates/upstart/neutron-server.upstart
rename to templates/git/upstart/neutron-server.upstart
diff --git a/unit_tests/test_quantum_utils.py b/unit_tests/test_quantum_utils.py
index 5ad5f00b..b64f3f37 100644
--- a/unit_tests/test_quantum_utils.py
+++ b/unit_tests/test_quantum_utils.py
@@ -1041,22 +1041,22 @@ class TestQuantumAgentReallocation(CharmTestCase):
             'log_file': '/var/log/neutron/vpn_agent.log',
         }
         expected = [
-            call('neutron_sudoers',
+            call('git/neutron_sudoers',
                  '/etc/sudoers.d/neutron_sudoers',
                  {}, perms=0o440),
-            call('cron.d/neutron-dhcp-agent-netns-cleanup',
+            call('git/cron.d/neutron-dhcp-agent-netns-cleanup',
                  '/etc/cron.d/neutron-dhcp-agent-netns-cleanup',
                  {}, perms=0o755),
-            call('cron.d/neutron-l3-agent-netns-cleanup',
+            call('git/cron.d/neutron-l3-agent-netns-cleanup',
                  '/etc/cron.d/neutron-l3-agent-netns-cleanup',
                  {}, perms=0o755),
-            call('cron.d/neutron-lbaas-agent-netns-cleanup',
+            call('git/cron.d/neutron-lbaas-agent-netns-cleanup',
                  '/etc/cron.d/neutron-lbaas-agent-netns-cleanup',
                  {}, perms=0o755),
-            call('upstart/neutron-agent.upstart',
+            call('git/upstart/neutron-agent.upstart',
                  '/etc/init/neutron-dhcp-agent.conf',
                  neutron_dhcp_agent_context, perms=0o644),
-            call('upstart/neutron-agent.upstart',
+            call('git/upstart/neutron-agent.upstart',
                  '/etc/init/neutron-l3-agent.conf',
                  neutron_l3_agent_context, perms=0o644),
             call('git.upstart',
@@ -1115,10 +1115,10 @@ class TestQuantumAgentReallocation(CharmTestCase):
                  '/etc/init/neutron-plugin-sriov-agent.conf',
                  neutron_plugin_sriov_context, perms=0o644,
                  templates_dir='joined-string'),
-            call('upstart/neutron-server.upstart',
+            call('git/upstart/neutron-server.upstart',
                  '/etc/init/neutron-server.conf',
                  neutron_api_context, perms=0o644),
-            call('upstart/neutron-agent.upstart',
+            call('git/upstart/neutron-agent.upstart',
                  '/etc/init/neutron-vpn-agent.conf',
                  neutron_vpn_agent_context, perms=0o644),
         ]