diff --git a/modules/openstack_project/files/accessbot/channels.yaml b/accessbot/channels.yaml
similarity index 100%
rename from modules/openstack_project/files/accessbot/channels.yaml
rename to accessbot/channels.yaml
diff --git a/modules/openstack_project/files/review-dev.projects.yaml b/dev/gerrit/projects.yaml
similarity index 100%
rename from modules/openstack_project/files/review-dev.projects.yaml
rename to dev/gerrit/projects.yaml
diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/dev/zuul/layout.yaml
similarity index 100%
rename from modules/openstack_project/files/zuul/layout-dev.yaml
rename to dev/zuul/layout.yaml
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-attic/database-api.config b/gerrit/acls/openstack-attic/database-api.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-attic/database-api.config
rename to gerrit/acls/openstack-attic/database-api.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-attic/melange.config b/gerrit/acls/openstack-attic/melange.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-attic/melange.config
rename to gerrit/acls/openstack-attic/melange.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-attic/openstack-chef.config b/gerrit/acls/openstack-attic/openstack-chef.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-attic/openstack-chef.config
rename to gerrit/acls/openstack-attic/openstack-chef.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-attic/openstack-qa.config b/gerrit/acls/openstack-attic/openstack-qa.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-attic/openstack-qa.config
rename to gerrit/acls/openstack-attic/openstack-qa.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-attic/openstack-security-notes.config b/gerrit/acls/openstack-attic/openstack-security-notes.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-attic/openstack-security-notes.config
rename to gerrit/acls/openstack-attic/openstack-security-notes.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-attic/python-melangeclient.config b/gerrit/acls/openstack-attic/python-melangeclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-attic/python-melangeclient.config
rename to gerrit/acls/openstack-attic/python-melangeclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/bashate.config b/gerrit/acls/openstack-dev/bashate.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/bashate.config
rename to gerrit/acls/openstack-dev/bashate.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/cookiecutter.config b/gerrit/acls/openstack-dev/cookiecutter.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/cookiecutter.config
rename to gerrit/acls/openstack-dev/cookiecutter.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack-vagrant.config b/gerrit/acls/openstack-dev/devstack-vagrant.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/devstack-vagrant.config
rename to gerrit/acls/openstack-dev/devstack-vagrant.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config b/gerrit/acls/openstack-dev/devstack.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config
rename to gerrit/acls/openstack-dev/devstack.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config b/gerrit/acls/openstack-dev/grenade.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/grenade.config
rename to gerrit/acls/openstack-dev/grenade.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/hacking.config b/gerrit/acls/openstack-dev/hacking.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/hacking.config
rename to gerrit/acls/openstack-dev/hacking.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config b/gerrit/acls/openstack-dev/heat-cfnclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/heat-cfnclient.config
rename to gerrit/acls/openstack-dev/heat-cfnclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config b/gerrit/acls/openstack-dev/openstack-nose.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config
rename to gerrit/acls/openstack-dev/openstack-nose.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/oslo-cookiecutter.config b/gerrit/acls/openstack-dev/oslo-cookiecutter.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/oslo-cookiecutter.config
rename to gerrit/acls/openstack-dev/oslo-cookiecutter.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config b/gerrit/acls/openstack-dev/pbr.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config
rename to gerrit/acls/openstack-dev/pbr.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config b/gerrit/acls/openstack-dev/sandbox.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config
rename to gerrit/acls/openstack-dev/sandbox.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/specs-cookiecutter.config b/gerrit/acls/openstack-dev/specs-cookiecutter.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-dev/specs-cookiecutter.config
rename to gerrit/acls/openstack-dev/specs-cookiecutter.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/activity-board.config b/gerrit/acls/openstack-infra/activity-board.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/activity-board.config
rename to gerrit/acls/openstack-infra/activity-board.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/askbot-theme.config b/gerrit/acls/openstack-infra/askbot-theme.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/askbot-theme.config
rename to gerrit/acls/openstack-infra/askbot-theme.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/bugdaystats.config b/gerrit/acls/openstack-infra/bugdaystats.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/bugdaystats.config
rename to gerrit/acls/openstack-infra/bugdaystats.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/config.config b/gerrit/acls/openstack-infra/config.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/config.config
rename to gerrit/acls/openstack-infra/config.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/devstack-gate.config b/gerrit/acls/openstack-infra/devstack-gate.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/devstack-gate.config
rename to gerrit/acls/openstack-infra/devstack-gate.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/elastic-recheck.config b/gerrit/acls/openstack-infra/elastic-recheck.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/elastic-recheck.config
rename to gerrit/acls/openstack-infra/elastic-recheck.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gear.config b/gerrit/acls/openstack-infra/gear.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/gear.config
rename to gerrit/acls/openstack-infra/gear.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gearman-plugin.config b/gerrit/acls/openstack-infra/gearman-plugin.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/gearman-plugin.config
rename to gerrit/acls/openstack-infra/gearman-plugin.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-powered-agenda.config b/gerrit/acls/openstack-infra/gerrit-powered-agenda.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-powered-agenda.config
rename to gerrit/acls/openstack-infra/gerrit-powered-agenda.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-verification-status-plugin.config b/gerrit/acls/openstack-infra/gerrit-verification-status-plugin.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit-verification-status-plugin.config
rename to gerrit/acls/openstack-infra/gerrit-verification-status-plugin.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit.config b/gerrit/acls/openstack-infra/gerrit.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/gerrit.config
rename to gerrit/acls/openstack-infra/gerrit.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritbot.config b/gerrit/acls/openstack-infra/gerritbot.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/gerritbot.config
rename to gerrit/acls/openstack-infra/gerritbot.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gerritlib.config b/gerrit/acls/openstack-infra/gerritlib.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/gerritlib.config
rename to gerrit/acls/openstack-infra/gerritlib.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/git-review.config b/gerrit/acls/openstack-infra/git-review.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/git-review.config
rename to gerrit/acls/openstack-infra/git-review.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/gitdm.config b/gerrit/acls/openstack-infra/gitdm.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/gitdm.config
rename to gerrit/acls/openstack-infra/gitdm.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/groups-static-pages.config b/gerrit/acls/openstack-infra/groups-static-pages.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/groups-static-pages.config
rename to gerrit/acls/openstack-infra/groups-static-pages.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/groups.config b/gerrit/acls/openstack-infra/groups.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/groups.config
rename to gerrit/acls/openstack-infra/groups.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/infra-manual.config b/gerrit/acls/openstack-infra/infra-manual.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/infra-manual.config
rename to gerrit/acls/openstack-infra/infra-manual.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/infra-specs.config b/gerrit/acls/openstack-infra/infra-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/infra-specs.config
rename to gerrit/acls/openstack-infra/infra-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config b/gerrit/acls/openstack-infra/jeepyb.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config
rename to gerrit/acls/openstack-infra/jeepyb.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/jenkins-job-builder.config b/gerrit/acls/openstack-infra/jenkins-job-builder.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/jenkins-job-builder.config
rename to gerrit/acls/openstack-infra/jenkins-job-builder.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/lodgeit.config b/gerrit/acls/openstack-infra/lodgeit.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/lodgeit.config
rename to gerrit/acls/openstack-infra/lodgeit.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/meetbot.config b/gerrit/acls/openstack-infra/meetbot.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/meetbot.config
rename to gerrit/acls/openstack-infra/meetbot.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/nodepool.config b/gerrit/acls/openstack-infra/nodepool.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/nodepool.config
rename to gerrit/acls/openstack-infra/nodepool.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/nose-html-output.config b/gerrit/acls/openstack-infra/nose-html-output.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/nose-html-output.config
rename to gerrit/acls/openstack-infra/nose-html-output.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/odsreg.config b/gerrit/acls/openstack-infra/odsreg.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/odsreg.config
rename to gerrit/acls/openstack-infra/odsreg.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/openstackid.config b/gerrit/acls/openstack-infra/openstackid.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/openstackid.config
rename to gerrit/acls/openstack-infra/openstackid.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/os-loganalyze.config b/gerrit/acls/openstack-infra/os-loganalyze.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/os-loganalyze.config
rename to gerrit/acls/openstack-infra/os-loganalyze.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/publications.config b/gerrit/acls/openstack-infra/publications.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/publications.config
rename to gerrit/acls/openstack-infra/publications.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config b/gerrit/acls/openstack-infra/puppet-apparmor.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config
rename to gerrit/acls/openstack-infra/puppet-apparmor.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config b/gerrit/acls/openstack-infra/puppet-dashboard.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config
rename to gerrit/acls/openstack-infra/puppet-dashboard.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-storyboard.config b/gerrit/acls/openstack-infra/puppet-storyboard.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-storyboard.config
rename to gerrit/acls/openstack-infra/puppet-storyboard.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config b/gerrit/acls/openstack-infra/puppet-vcsrepo.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config
rename to gerrit/acls/openstack-infra/puppet-vcsrepo.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config b/gerrit/acls/openstack-infra/puppet-vinz.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config
rename to gerrit/acls/openstack-infra/puppet-vinz.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-yum.config b/gerrit/acls/openstack-infra/puppet-yum.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-yum.config
rename to gerrit/acls/openstack-infra/puppet-yum.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-zuul.config b/gerrit/acls/openstack-infra/puppet-zuul.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-zuul.config
rename to gerrit/acls/openstack-infra/puppet-zuul.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config b/gerrit/acls/openstack-infra/pypi-mirror.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config
rename to gerrit/acls/openstack-infra/pypi-mirror.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/release-tools.config b/gerrit/acls/openstack-infra/release-tools.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/release-tools.config
rename to gerrit/acls/openstack-infra/release-tools.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/releasestatus.config b/gerrit/acls/openstack-infra/releasestatus.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/releasestatus.config
rename to gerrit/acls/openstack-infra/releasestatus.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewday.config b/gerrit/acls/openstack-infra/reviewday.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/reviewday.config
rename to gerrit/acls/openstack-infra/reviewday.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/reviewstats.config b/gerrit/acls/openstack-infra/reviewstats.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/reviewstats.config
rename to gerrit/acls/openstack-infra/reviewstats.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/statusbot.config b/gerrit/acls/openstack-infra/statusbot.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/statusbot.config
rename to gerrit/acls/openstack-infra/statusbot.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/storyboard.config b/gerrit/acls/openstack-infra/storyboard.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/storyboard.config
rename to gerrit/acls/openstack-infra/storyboard.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/subunit2sql.config b/gerrit/acls/openstack-infra/subunit2sql.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/subunit2sql.config
rename to gerrit/acls/openstack-infra/subunit2sql.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config b/gerrit/acls/openstack-infra/tripleo-ci.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config
rename to gerrit/acls/openstack-infra/tripleo-ci.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/vinz.config b/gerrit/acls/openstack-infra/vinz.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/vinz.config
rename to gerrit/acls/openstack-infra/vinz.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/zmq-event-publisher.config b/gerrit/acls/openstack-infra/zmq-event-publisher.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/zmq-event-publisher.config
rename to gerrit/acls/openstack-infra/zmq-event-publisher.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul-packaging.config b/gerrit/acls/openstack-infra/zuul-packaging.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/zuul-packaging.config
rename to gerrit/acls/openstack-infra/zuul-packaging.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config b/gerrit/acls/openstack-infra/zuul.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config
rename to gerrit/acls/openstack-infra/zuul.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/api-site.config b/gerrit/acls/openstack/api-site.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/api-site.config
rename to gerrit/acls/openstack/api-site.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/barbican-specs.config b/gerrit/acls/openstack/barbican-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/barbican-specs.config
rename to gerrit/acls/openstack/barbican-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/barbican.config b/gerrit/acls/openstack/barbican.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/barbican.config
rename to gerrit/acls/openstack/barbican.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/ceilometer-specs.config b/gerrit/acls/openstack/ceilometer-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/ceilometer-specs.config
rename to gerrit/acls/openstack/ceilometer-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config b/gerrit/acls/openstack/ceilometer.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config
rename to gerrit/acls/openstack/ceilometer.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/cinder-specs.config b/gerrit/acls/openstack/cinder-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/cinder-specs.config
rename to gerrit/acls/openstack/cinder-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/cinder.config b/gerrit/acls/openstack/cinder.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/cinder.config
rename to gerrit/acls/openstack/cinder.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/cliff.config b/gerrit/acls/openstack/cliff.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/cliff.config
rename to gerrit/acls/openstack/cliff.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/compute-api.config b/gerrit/acls/openstack/compute-api.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/compute-api.config
rename to gerrit/acls/openstack/compute-api.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/designate-specs.config b/gerrit/acls/openstack/designate-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/designate-specs.config
rename to gerrit/acls/openstack/designate-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/designate.config b/gerrit/acls/openstack/designate.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/designate.config
rename to gerrit/acls/openstack/designate.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/dib-utils.config b/gerrit/acls/openstack/dib-utils.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/dib-utils.config
rename to gerrit/acls/openstack/dib-utils.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/diskimage-builder.config b/gerrit/acls/openstack/diskimage-builder.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/diskimage-builder.config
rename to gerrit/acls/openstack/diskimage-builder.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/django_openstack_auth.config b/gerrit/acls/openstack/django_openstack_auth.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/django_openstack_auth.config
rename to gerrit/acls/openstack/django_openstack_auth.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/docs-specs.config b/gerrit/acls/openstack/docs-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/docs-specs.config
rename to gerrit/acls/openstack/docs-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/gantt.config b/gerrit/acls/openstack/gantt.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/gantt.config
rename to gerrit/acls/openstack/gantt.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/glance-specs.config b/gerrit/acls/openstack/glance-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/glance-specs.config
rename to gerrit/acls/openstack/glance-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/glance.config b/gerrit/acls/openstack/glance.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/glance.config
rename to gerrit/acls/openstack/glance.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/governance.config b/gerrit/acls/openstack/governance.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/governance.config
rename to gerrit/acls/openstack/governance.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/ha-guide.config b/gerrit/acls/openstack/ha-guide.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/ha-guide.config
rename to gerrit/acls/openstack/ha-guide.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config b/gerrit/acls/openstack/heat-cfntools.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/heat-cfntools.config
rename to gerrit/acls/openstack/heat-cfntools.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/heat-specs.config b/gerrit/acls/openstack/heat-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/heat-specs.config
rename to gerrit/acls/openstack/heat-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/heat-templates.config b/gerrit/acls/openstack/heat-templates.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/heat-templates.config
rename to gerrit/acls/openstack/heat-templates.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/heat.config b/gerrit/acls/openstack/heat.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/heat.config
rename to gerrit/acls/openstack/heat.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/horizon.config b/gerrit/acls/openstack/horizon.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/horizon.config
rename to gerrit/acls/openstack/horizon.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/identity-api.config b/gerrit/acls/openstack/identity-api.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/identity-api.config
rename to gerrit/acls/openstack/identity-api.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/image-api.config b/gerrit/acls/openstack/image-api.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/image-api.config
rename to gerrit/acls/openstack/image-api.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/ironic-python-agent.config b/gerrit/acls/openstack/ironic-python-agent.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/ironic-python-agent.config
rename to gerrit/acls/openstack/ironic-python-agent.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/ironic-specs.config b/gerrit/acls/openstack/ironic-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/ironic-specs.config
rename to gerrit/acls/openstack/ironic-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/ironic.config b/gerrit/acls/openstack/ironic.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/ironic.config
rename to gerrit/acls/openstack/ironic.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/keystone-specs.config b/gerrit/acls/openstack/keystone-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/keystone-specs.config
rename to gerrit/acls/openstack/keystone-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/keystone.config b/gerrit/acls/openstack/keystone.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/keystone.config
rename to gerrit/acls/openstack/keystone.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/keystonemiddleware.config b/gerrit/acls/openstack/keystonemiddleware.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/keystonemiddleware.config
rename to gerrit/acls/openstack/keystonemiddleware.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/kite.config b/gerrit/acls/openstack/kite.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/kite.config
rename to gerrit/acls/openstack/kite.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/manila.config b/gerrit/acls/openstack/manila.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/manila.config
rename to gerrit/acls/openstack/manila.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config b/gerrit/acls/openstack/netconn-api.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config
rename to gerrit/acls/openstack/netconn-api.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/neutron-specs.config b/gerrit/acls/openstack/neutron-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/neutron-specs.config
rename to gerrit/acls/openstack/neutron-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/neutron.config b/gerrit/acls/openstack/neutron.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/neutron.config
rename to gerrit/acls/openstack/neutron.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/nova-specs.config b/gerrit/acls/openstack/nova-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/nova-specs.config
rename to gerrit/acls/openstack/nova-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/nova.config b/gerrit/acls/openstack/nova.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/nova.config
rename to gerrit/acls/openstack/nova.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/object-api.config b/gerrit/acls/openstack/object-api.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/object-api.config
rename to gerrit/acls/openstack/object-api.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-doc-tools.config b/gerrit/acls/openstack/openstack-doc-tools.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/openstack-doc-tools.config
rename to gerrit/acls/openstack/openstack-doc-tools.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config b/gerrit/acls/openstack/openstack-manuals.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config
rename to gerrit/acls/openstack/openstack-manuals.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-planet.config b/gerrit/acls/openstack/openstack-planet.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/openstack-planet.config
rename to gerrit/acls/openstack/openstack-planet.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-puppet.config b/gerrit/acls/openstack/openstack-puppet.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/openstack-puppet.config
rename to gerrit/acls/openstack/openstack-puppet.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack.config b/gerrit/acls/openstack/openstack.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/openstack.config
rename to gerrit/acls/openstack/openstack.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/operations-guide.config b/gerrit/acls/openstack/operations-guide.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/operations-guide.config
rename to gerrit/acls/openstack/operations-guide.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/os-apply-config.config b/gerrit/acls/openstack/os-apply-config.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/os-apply-config.config
rename to gerrit/acls/openstack/os-apply-config.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config b/gerrit/acls/openstack/oslo-incubator.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config
rename to gerrit/acls/openstack/oslo-incubator.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo-specs.config b/gerrit/acls/openstack/oslo-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo-specs.config
rename to gerrit/acls/openstack/oslo-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.concurrency.config b/gerrit/acls/openstack/oslo.concurrency.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.concurrency.config
rename to gerrit/acls/openstack/oslo.concurrency.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.config.config b/gerrit/acls/openstack/oslo.config.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.config.config
rename to gerrit/acls/openstack/oslo.config.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.db.config b/gerrit/acls/openstack/oslo.db.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.db.config
rename to gerrit/acls/openstack/oslo.db.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.i18n.config b/gerrit/acls/openstack/oslo.i18n.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.i18n.config
rename to gerrit/acls/openstack/oslo.i18n.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.log.config b/gerrit/acls/openstack/oslo.log.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.log.config
rename to gerrit/acls/openstack/oslo.log.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.messaging.config b/gerrit/acls/openstack/oslo.messaging.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.messaging.config
rename to gerrit/acls/openstack/oslo.messaging.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.middleware.config b/gerrit/acls/openstack/oslo.middleware.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.middleware.config
rename to gerrit/acls/openstack/oslo.middleware.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.rootwrap.config b/gerrit/acls/openstack/oslo.rootwrap.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.rootwrap.config
rename to gerrit/acls/openstack/oslo.rootwrap.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.serialization.config b/gerrit/acls/openstack/oslo.serialization.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.serialization.config
rename to gerrit/acls/openstack/oslo.serialization.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.utils.config b/gerrit/acls/openstack/oslo.utils.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.utils.config
rename to gerrit/acls/openstack/oslo.utils.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config b/gerrit/acls/openstack/oslo.version.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config
rename to gerrit/acls/openstack/oslo.version.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.vmware.config b/gerrit/acls/openstack/oslo.vmware.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.vmware.config
rename to gerrit/acls/openstack/oslo.vmware.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslosphinx.config b/gerrit/acls/openstack/oslosphinx.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslosphinx.config
rename to gerrit/acls/openstack/oslosphinx.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslotest.config b/gerrit/acls/openstack/oslotest.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslotest.config
rename to gerrit/acls/openstack/oslotest.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/pycadf.config b/gerrit/acls/openstack/pycadf.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/pycadf.config
rename to gerrit/acls/openstack/pycadf.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/pylockfile.config b/gerrit/acls/openstack/pylockfile.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/pylockfile.config
rename to gerrit/acls/openstack/pylockfile.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-barbicanclient.config b/gerrit/acls/openstack/python-barbicanclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-barbicanclient.config
rename to gerrit/acls/openstack/python-barbicanclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-ceilometerclient.config b/gerrit/acls/openstack/python-ceilometerclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-ceilometerclient.config
rename to gerrit/acls/openstack/python-ceilometerclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-cinderclient.config b/gerrit/acls/openstack/python-cinderclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-cinderclient.config
rename to gerrit/acls/openstack/python-cinderclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-designateclient.config b/gerrit/acls/openstack/python-designateclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-designateclient.config
rename to gerrit/acls/openstack/python-designateclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-glanceclient.config b/gerrit/acls/openstack/python-glanceclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-glanceclient.config
rename to gerrit/acls/openstack/python-glanceclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config b/gerrit/acls/openstack/python-heatclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config
rename to gerrit/acls/openstack/python-heatclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-ironicclient.config b/gerrit/acls/openstack/python-ironicclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-ironicclient.config
rename to gerrit/acls/openstack/python-ironicclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-keystoneclient.config b/gerrit/acls/openstack/python-keystoneclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-keystoneclient.config
rename to gerrit/acls/openstack/python-keystoneclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-kiteclient.config b/gerrit/acls/openstack/python-kiteclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-kiteclient.config
rename to gerrit/acls/openstack/python-kiteclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-manilaclient.config b/gerrit/acls/openstack/python-manilaclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-manilaclient.config
rename to gerrit/acls/openstack/python-manilaclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-neutronclient.config b/gerrit/acls/openstack/python-neutronclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-neutronclient.config
rename to gerrit/acls/openstack/python-neutronclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-novaclient.config b/gerrit/acls/openstack/python-novaclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-novaclient.config
rename to gerrit/acls/openstack/python-novaclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-openstackclient.config b/gerrit/acls/openstack/python-openstackclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-openstackclient.config
rename to gerrit/acls/openstack/python-openstackclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-saharaclient.config b/gerrit/acls/openstack/python-saharaclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-saharaclient.config
rename to gerrit/acls/openstack/python-saharaclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config b/gerrit/acls/openstack/python-swiftclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config
rename to gerrit/acls/openstack/python-swiftclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config b/gerrit/acls/openstack/python-troveclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config
rename to gerrit/acls/openstack/python-troveclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-tuskarclient.config b/gerrit/acls/openstack/python-tuskarclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-tuskarclient.config
rename to gerrit/acls/openstack/python-tuskarclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-zaqarclient.config b/gerrit/acls/openstack/python-zaqarclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/python-zaqarclient.config
rename to gerrit/acls/openstack/python-zaqarclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/qa-specs.config b/gerrit/acls/openstack/qa-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/qa-specs.config
rename to gerrit/acls/openstack/qa-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/requirements.config b/gerrit/acls/openstack/requirements.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/requirements.config
rename to gerrit/acls/openstack/requirements.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/sahara-etc.config b/gerrit/acls/openstack/sahara-etc.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/sahara-etc.config
rename to gerrit/acls/openstack/sahara-etc.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/sahara-specs.config b/gerrit/acls/openstack/sahara-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/sahara-specs.config
rename to gerrit/acls/openstack/sahara-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/sahara.config b/gerrit/acls/openstack/sahara.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/sahara.config
rename to gerrit/acls/openstack/sahara.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/security-doc.config b/gerrit/acls/openstack/security-doc.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/security-doc.config
rename to gerrit/acls/openstack/security-doc.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/stevedore.config b/gerrit/acls/openstack/stevedore.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/stevedore.config
rename to gerrit/acls/openstack/stevedore.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/swift-bench.config b/gerrit/acls/openstack/swift-bench.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/swift-bench.config
rename to gerrit/acls/openstack/swift-bench.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/swift-specs.config b/gerrit/acls/openstack/swift-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/swift-specs.config
rename to gerrit/acls/openstack/swift-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/swift.config b/gerrit/acls/openstack/swift.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/swift.config
rename to gerrit/acls/openstack/swift.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/swiftsync.config b/gerrit/acls/openstack/swiftsync.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/swiftsync.config
rename to gerrit/acls/openstack/swiftsync.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/taskflow.config b/gerrit/acls/openstack/taskflow.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/taskflow.config
rename to gerrit/acls/openstack/taskflow.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tempest.config b/gerrit/acls/openstack/tempest.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/tempest.config
rename to gerrit/acls/openstack/tempest.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/training-guides.config b/gerrit/acls/openstack/training-guides.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/training-guides.config
rename to gerrit/acls/openstack/training-guides.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-heat-templates.config b/gerrit/acls/openstack/tripleo-heat-templates.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/tripleo-heat-templates.config
rename to gerrit/acls/openstack/tripleo-heat-templates.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-image-elements.config b/gerrit/acls/openstack/tripleo-image-elements.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/tripleo-image-elements.config
rename to gerrit/acls/openstack/tripleo-image-elements.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-incubator.config b/gerrit/acls/openstack/tripleo-incubator.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/tripleo-incubator.config
rename to gerrit/acls/openstack/tripleo-incubator.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tripleo-specs.config b/gerrit/acls/openstack/tripleo-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/tripleo-specs.config
rename to gerrit/acls/openstack/tripleo-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/trove-integration.config b/gerrit/acls/openstack/trove-integration.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/trove-integration.config
rename to gerrit/acls/openstack/trove-integration.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/trove-specs.config b/gerrit/acls/openstack/trove-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/trove-specs.config
rename to gerrit/acls/openstack/trove-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/trove.config b/gerrit/acls/openstack/trove.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/trove.config
rename to gerrit/acls/openstack/trove.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tuskar-ui.config b/gerrit/acls/openstack/tuskar-ui.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/tuskar-ui.config
rename to gerrit/acls/openstack/tuskar-ui.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tuskar.config b/gerrit/acls/openstack/tuskar.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/tuskar.config
rename to gerrit/acls/openstack/tuskar.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/volume-api.config b/gerrit/acls/openstack/volume-api.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/volume-api.config
rename to gerrit/acls/openstack/volume-api.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/zaqar-specs.config b/gerrit/acls/openstack/zaqar-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/zaqar-specs.config
rename to gerrit/acls/openstack/zaqar-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/zaqar.config b/gerrit/acls/openstack/zaqar.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/zaqar.config
rename to gerrit/acls/openstack/zaqar.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-common.config b/gerrit/acls/stackforge-attic/murano-common.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-common.config
rename to gerrit/acls/stackforge-attic/murano-common.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-conductor.config b/gerrit/acls/stackforge-attic/murano-conductor.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-conductor.config
rename to gerrit/acls/stackforge-attic/murano-conductor.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-metadataclient.config b/gerrit/acls/stackforge-attic/murano-metadataclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-metadataclient.config
rename to gerrit/acls/stackforge-attic/murano-metadataclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-repository.config b/gerrit/acls/stackforge-attic/murano-repository.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-repository.config
rename to gerrit/acls/stackforge-attic/murano-repository.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-tests.config b/gerrit/acls/stackforge-attic/murano-tests.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge-attic/murano-tests.config
rename to gerrit/acls/stackforge-attic/murano-tests.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/MRaaS.config b/gerrit/acls/stackforge/MRaaS.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/MRaaS.config
rename to gerrit/acls/stackforge/MRaaS.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/anvil.config b/gerrit/acls/stackforge/anvil.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/anvil.config
rename to gerrit/acls/stackforge/anvil.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/aviator.config b/gerrit/acls/stackforge/aviator.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/aviator.config
rename to gerrit/acls/stackforge/aviator.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/bandit.config b/gerrit/acls/stackforge/bandit.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/bandit.config
rename to gerrit/acls/stackforge/bandit.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/billingstack.config b/gerrit/acls/stackforge/billingstack.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/billingstack.config
rename to gerrit/acls/stackforge/billingstack.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/bindep.config b/gerrit/acls/stackforge/bindep.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/bindep.config
rename to gerrit/acls/stackforge/bindep.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/blazar.config b/gerrit/acls/stackforge/blazar.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/blazar.config
rename to gerrit/acls/stackforge/blazar.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/bufunfa.config b/gerrit/acls/stackforge/bufunfa.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/bufunfa.config
rename to gerrit/acls/stackforge/bufunfa.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/cachemonkey.config b/gerrit/acls/stackforge/cachemonkey.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/cachemonkey.config
rename to gerrit/acls/stackforge/cachemonkey.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/chef-cookbooks.config b/gerrit/acls/stackforge/chef-cookbooks.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/chef-cookbooks.config
rename to gerrit/acls/stackforge/chef-cookbooks.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/cl-openstack-client.config b/gerrit/acls/stackforge/cl-openstack-client.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/cl-openstack-client.config
rename to gerrit/acls/stackforge/cl-openstack-client.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/cloudbase-init.config b/gerrit/acls/stackforge/cloudbase-init.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/cloudbase-init.config
rename to gerrit/acls/stackforge/cloudbase-init.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/cloudcafe.config b/gerrit/acls/stackforge/cloudcafe.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/cloudcafe.config
rename to gerrit/acls/stackforge/cloudcafe.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/clouddocs-maven-plugin.config b/gerrit/acls/stackforge/clouddocs-maven-plugin.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/clouddocs-maven-plugin.config
rename to gerrit/acls/stackforge/clouddocs-maven-plugin.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/cloudkitty.config b/gerrit/acls/stackforge/cloudkitty.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/cloudkitty.config
rename to gerrit/acls/stackforge/cloudkitty.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/cloudroast.config b/gerrit/acls/stackforge/cloudroast.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/cloudroast.config
rename to gerrit/acls/stackforge/cloudroast.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/compass.config b/gerrit/acls/stackforge/compass.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/compass.config
rename to gerrit/acls/stackforge/compass.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/congress-specs.config b/gerrit/acls/stackforge/congress-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/congress-specs.config
rename to gerrit/acls/stackforge/congress-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/congress.config b/gerrit/acls/stackforge/congress.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/congress.config
rename to gerrit/acls/stackforge/congress.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/doc8.config b/gerrit/acls/stackforge/doc8.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/doc8.config
rename to gerrit/acls/stackforge/doc8.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/dox.config b/gerrit/acls/stackforge/dox.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/dox.config
rename to gerrit/acls/stackforge/dox.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/driverlog.config b/gerrit/acls/stackforge/driverlog.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/driverlog.config
rename to gerrit/acls/stackforge/driverlog.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/ec2-api.config b/gerrit/acls/stackforge/ec2-api.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/ec2-api.config
rename to gerrit/acls/stackforge/ec2-api.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/entropy.config b/gerrit/acls/stackforge/entropy.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/entropy.config
rename to gerrit/acls/stackforge/entropy.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/flame.config b/gerrit/acls/stackforge/flame.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/flame.config
rename to gerrit/acls/stackforge/flame.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/freezer.config b/gerrit/acls/stackforge/freezer.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/freezer.config
rename to gerrit/acls/stackforge/freezer.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/fuel.config b/gerrit/acls/stackforge/fuel.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/fuel.config
rename to gerrit/acls/stackforge/fuel.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/gce-api.config b/gerrit/acls/stackforge/gce-api.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/gce-api.config
rename to gerrit/acls/stackforge/gce-api.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/gerrit-dash-creator.config b/gerrit/acls/stackforge/gerrit-dash-creator.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/gerrit-dash-creator.config
rename to gerrit/acls/stackforge/gerrit-dash-creator.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/gertty.config b/gerrit/acls/stackforge/gertty.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/gertty.config
rename to gerrit/acls/stackforge/gertty.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/git-upstream.config b/gerrit/acls/stackforge/git-upstream.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/git-upstream.config
rename to gerrit/acls/stackforge/git-upstream.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/gnocchi.config b/gerrit/acls/stackforge/gnocchi.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/gnocchi.config
rename to gerrit/acls/stackforge/gnocchi.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/golang-client.config b/gerrit/acls/stackforge/golang-client.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/golang-client.config
rename to gerrit/acls/stackforge/golang-client.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/graffiti.config b/gerrit/acls/stackforge/graffiti.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/graffiti.config
rename to gerrit/acls/stackforge/graffiti.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/group-based-policy.config b/gerrit/acls/stackforge/group-based-policy.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/group-based-policy.config
rename to gerrit/acls/stackforge/group-based-policy.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/healthnmon.config b/gerrit/acls/stackforge/healthnmon.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/healthnmon.config
rename to gerrit/acls/stackforge/healthnmon.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/heat-translator.config b/gerrit/acls/stackforge/heat-translator.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/heat-translator.config
rename to gerrit/acls/stackforge/heat-translator.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/inception.config b/gerrit/acls/stackforge/inception.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/inception.config
rename to gerrit/acls/stackforge/inception.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/kickstack.config b/gerrit/acls/stackforge/kickstack.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/kickstack.config
rename to gerrit/acls/stackforge/kickstack.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/kwapi.config b/gerrit/acls/stackforge/kwapi.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/kwapi.config
rename to gerrit/acls/stackforge/kwapi.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/libra.config b/gerrit/acls/stackforge/libra.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/libra.config
rename to gerrit/acls/stackforge/libra.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/logaas.config b/gerrit/acls/stackforge/logaas.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/logaas.config
rename to gerrit/acls/stackforge/logaas.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config b/gerrit/acls/stackforge/magnetodb.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/magnetodb.config
rename to gerrit/acls/stackforge/magnetodb.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/merlin.config b/gerrit/acls/stackforge/merlin.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/merlin.config
rename to gerrit/acls/stackforge/merlin.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/milk.config b/gerrit/acls/stackforge/milk.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/milk.config
rename to gerrit/acls/stackforge/milk.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config b/gerrit/acls/stackforge/mistral.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/mistral.config
rename to gerrit/acls/stackforge/mistral.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/monasca.config b/gerrit/acls/stackforge/monasca.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/monasca.config
rename to gerrit/acls/stackforge/monasca.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/murano.config b/gerrit/acls/stackforge/murano.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/murano.config
rename to gerrit/acls/stackforge/murano.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/namos.config b/gerrit/acls/stackforge/namos.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/namos.config
rename to gerrit/acls/stackforge/namos.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/nova-docker.config b/gerrit/acls/stackforge/nova-docker.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/nova-docker.config
rename to gerrit/acls/stackforge/nova-docker.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/nova-solver-scheduler.config b/gerrit/acls/stackforge/nova-solver-scheduler.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/nova-solver-scheduler.config
rename to gerrit/acls/stackforge/nova-solver-scheduler.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/novaimagebuilder.config b/gerrit/acls/stackforge/novaimagebuilder.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/novaimagebuilder.config
rename to gerrit/acls/stackforge/novaimagebuilder.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/occi-os.config b/gerrit/acls/stackforge/occi-os.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/occi-os.config
rename to gerrit/acls/stackforge/occi-os.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/octavia.config b/gerrit/acls/stackforge/octavia.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/octavia.config
rename to gerrit/acls/stackforge/octavia.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/opencafe.config b/gerrit/acls/stackforge/opencafe.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/opencafe.config
rename to gerrit/acls/stackforge/opencafe.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/openstack-cli-powershell.config b/gerrit/acls/stackforge/openstack-cli-powershell.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/openstack-cli-powershell.config
rename to gerrit/acls/stackforge/openstack-cli-powershell.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/openstack-sdk-dotnet.config b/gerrit/acls/stackforge/openstack-sdk-dotnet.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/openstack-sdk-dotnet.config
rename to gerrit/acls/stackforge/openstack-sdk-dotnet.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/openstack-sdk-php.config b/gerrit/acls/stackforge/openstack-sdk-php.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/openstack-sdk-php.config
rename to gerrit/acls/stackforge/openstack-sdk-php.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/openstackdroid.config b/gerrit/acls/stackforge/openstackdroid.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/openstackdroid.config
rename to gerrit/acls/stackforge/openstackdroid.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/openvz-nova-driver.config b/gerrit/acls/stackforge/openvz-nova-driver.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/openvz-nova-driver.config
rename to gerrit/acls/stackforge/openvz-nova-driver.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/os-client-config.config b/gerrit/acls/stackforge/os-client-config.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/os-client-config.config
rename to gerrit/acls/stackforge/os-client-config.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/osprofiler.config b/gerrit/acls/stackforge/osprofiler.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/osprofiler.config
rename to gerrit/acls/stackforge/osprofiler.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/ospurge.config b/gerrit/acls/stackforge/ospurge.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/ospurge.config
rename to gerrit/acls/stackforge/ospurge.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/packstack.config b/gerrit/acls/stackforge/packstack.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/packstack.config
rename to gerrit/acls/stackforge/packstack.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/pecan.config b/gerrit/acls/stackforge/pecan.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/pecan.config
rename to gerrit/acls/stackforge/pecan.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/poppy.config b/gerrit/acls/stackforge/poppy.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/poppy.config
rename to gerrit/acls/stackforge/poppy.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/powervc-driver.config b/gerrit/acls/stackforge/powervc-driver.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/powervc-driver.config
rename to gerrit/acls/stackforge/powervc-driver.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/puppet-ceph.config b/gerrit/acls/stackforge/puppet-ceph.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/puppet-ceph.config
rename to gerrit/acls/stackforge/puppet-ceph.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/puppet-modules.config b/gerrit/acls/stackforge/puppet-modules.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/puppet-modules.config
rename to gerrit/acls/stackforge/puppet-modules.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/puppet-n1k-vsm.config b/gerrit/acls/stackforge/puppet-n1k-vsm.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/puppet-n1k-vsm.config
rename to gerrit/acls/stackforge/puppet-n1k-vsm.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/pyghmi.config b/gerrit/acls/stackforge/pyghmi.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/pyghmi.config
rename to gerrit/acls/stackforge/pyghmi.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-congressclient.config b/gerrit/acls/stackforge/python-congressclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-congressclient.config
rename to gerrit/acls/stackforge/python-congressclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-jenkins.config b/gerrit/acls/stackforge/python-jenkins.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-jenkins.config
rename to gerrit/acls/stackforge/python-jenkins.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-libraclient.config b/gerrit/acls/stackforge/python-libraclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-libraclient.config
rename to gerrit/acls/stackforge/python-libraclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-magnetodbclient.config b/gerrit/acls/stackforge/python-magnetodbclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-magnetodbclient.config
rename to gerrit/acls/stackforge/python-magnetodbclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-openstacksdk.config b/gerrit/acls/stackforge/python-openstacksdk.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-openstacksdk.config
rename to gerrit/acls/stackforge/python-openstacksdk.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-opentsdbclient.config b/gerrit/acls/stackforge/python-opentsdbclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-opentsdbclient.config
rename to gerrit/acls/stackforge/python-opentsdbclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-solumclient.config b/gerrit/acls/stackforge/python-solumclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-solumclient.config
rename to gerrit/acls/stackforge/python-solumclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-surveilclient.config b/gerrit/acls/stackforge/python-surveilclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-surveilclient.config
rename to gerrit/acls/stackforge/python-surveilclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-tackerclient.config b/gerrit/acls/stackforge/python-tackerclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-tackerclient.config
rename to gerrit/acls/stackforge/python-tackerclient.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/rack.config b/gerrit/acls/stackforge/rack.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/rack.config
rename to gerrit/acls/stackforge/rack.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/radar.config b/gerrit/acls/stackforge/radar.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/radar.config
rename to gerrit/acls/stackforge/radar.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/rally.config b/gerrit/acls/stackforge/rally.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/rally.config
rename to gerrit/acls/stackforge/rally.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/refstack-client.config b/gerrit/acls/stackforge/refstack-client.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/refstack-client.config
rename to gerrit/acls/stackforge/refstack-client.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/refstack.config b/gerrit/acls/stackforge/refstack.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/refstack.config
rename to gerrit/acls/stackforge/refstack.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/requests-mock.config b/gerrit/acls/stackforge/requests-mock.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/requests-mock.config
rename to gerrit/acls/stackforge/requests-mock.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/rubick.config b/gerrit/acls/stackforge/rubick.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/rubick.config
rename to gerrit/acls/stackforge/rubick.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/sahara-ci-config.config b/gerrit/acls/stackforge/sahara-ci-config.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/sahara-ci-config.config
rename to gerrit/acls/stackforge/sahara-ci-config.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/sahara-guestagent.config b/gerrit/acls/stackforge/sahara-guestagent.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/sahara-guestagent.config
rename to gerrit/acls/stackforge/sahara-guestagent.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/salt-formula.config b/gerrit/acls/stackforge/salt-formula.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/salt-formula.config
rename to gerrit/acls/stackforge/salt-formula.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/saml-generator.config b/gerrit/acls/stackforge/saml-generator.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/saml-generator.config
rename to gerrit/acls/stackforge/saml-generator.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/satori.config b/gerrit/acls/stackforge/satori.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/satori.config
rename to gerrit/acls/stackforge/satori.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/solum-dashboard.config b/gerrit/acls/stackforge/solum-dashboard.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/solum-dashboard.config
rename to gerrit/acls/stackforge/solum-dashboard.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/solum-infra-guestagent.config b/gerrit/acls/stackforge/solum-infra-guestagent.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/solum-infra-guestagent.config
rename to gerrit/acls/stackforge/solum-infra-guestagent.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/solum-specs.config b/gerrit/acls/stackforge/solum-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/solum-specs.config
rename to gerrit/acls/stackforge/solum-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/solum.config b/gerrit/acls/stackforge/solum.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/solum.config
rename to gerrit/acls/stackforge/solum.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/sphinxcontrib-docbookrestapi.config b/gerrit/acls/stackforge/sphinxcontrib-docbookrestapi.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/sphinxcontrib-docbookrestapi.config
rename to gerrit/acls/stackforge/sphinxcontrib-docbookrestapi.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/sqlalchemy-migrate.config b/gerrit/acls/stackforge/sqlalchemy-migrate.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/sqlalchemy-migrate.config
rename to gerrit/acls/stackforge/sqlalchemy-migrate.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/staccato.config b/gerrit/acls/stackforge/staccato.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/staccato.config
rename to gerrit/acls/stackforge/staccato.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/stackalytics.config b/gerrit/acls/stackforge/stackalytics.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/stackalytics.config
rename to gerrit/acls/stackforge/stackalytics.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/stacktach.config b/gerrit/acls/stackforge/stacktach.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/stacktach.config
rename to gerrit/acls/stackforge/stacktach.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/surveil-specs.config b/gerrit/acls/stackforge/surveil-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/surveil-specs.config
rename to gerrit/acls/stackforge/surveil-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/surveil.config b/gerrit/acls/stackforge/surveil.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/surveil.config
rename to gerrit/acls/stackforge/surveil.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/swift-ceph-backend.config b/gerrit/acls/stackforge/swift-ceph-backend.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/swift-ceph-backend.config
rename to gerrit/acls/stackforge/swift-ceph-backend.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/swift3.config b/gerrit/acls/stackforge/swift3.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/swift3.config
rename to gerrit/acls/stackforge/swift3.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/swiftonfile.config b/gerrit/acls/stackforge/swiftonfile.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/swiftonfile.config
rename to gerrit/acls/stackforge/swiftonfile.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/swiftpolicy.config b/gerrit/acls/stackforge/swiftpolicy.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/swiftpolicy.config
rename to gerrit/acls/stackforge/swiftpolicy.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/tacker-specs.config b/gerrit/acls/stackforge/tacker-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/tacker-specs.config
rename to gerrit/acls/stackforge/tacker-specs.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/tacker.config b/gerrit/acls/stackforge/tacker.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/tacker.config
rename to gerrit/acls/stackforge/tacker.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/tomograph.config b/gerrit/acls/stackforge/tomograph.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/tomograph.config
rename to gerrit/acls/stackforge/tomograph.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/tooz.config b/gerrit/acls/stackforge/tooz.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/tooz.config
rename to gerrit/acls/stackforge/tooz.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/tricircle.config b/gerrit/acls/stackforge/tricircle.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/tricircle.config
rename to gerrit/acls/stackforge/tricircle.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/tripleo-ansible.config b/gerrit/acls/stackforge/tripleo-ansible.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/tripleo-ansible.config
rename to gerrit/acls/stackforge/tripleo-ansible.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/turbo-hipster.config b/gerrit/acls/stackforge/turbo-hipster.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/turbo-hipster.config
rename to gerrit/acls/stackforge/turbo-hipster.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/tuskar-ui-extras.config b/gerrit/acls/stackforge/tuskar-ui-extras.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/tuskar-ui-extras.config
rename to gerrit/acls/stackforge/tuskar-ui-extras.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/warm.config b/gerrit/acls/stackforge/warm.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/warm.config
rename to gerrit/acls/stackforge/warm.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/wsme.config b/gerrit/acls/stackforge/wsme.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/wsme.config
rename to gerrit/acls/stackforge/wsme.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/xenapi-os-testing.config b/gerrit/acls/stackforge/xenapi-os-testing.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/xenapi-os-testing.config
rename to gerrit/acls/stackforge/xenapi-os-testing.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/xstatic.config b/gerrit/acls/stackforge/xstatic.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/xstatic.config
rename to gerrit/acls/stackforge/xstatic.config
diff --git a/modules/openstack_project/files/gerrit/acls/test-manage-project.config b/gerrit/acls/test-manage-project.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/test-manage-project.config
rename to gerrit/acls/test-manage-project.config
diff --git a/modules/openstack_project/files/gerrit/notify_impact.yaml b/gerrit/notify_impact.yaml
similarity index 100%
rename from modules/openstack_project/files/gerrit/notify_impact.yaml
rename to gerrit/notify_impact.yaml
diff --git a/modules/openstack_project/files/review.projects.yaml b/gerrit/projects.yaml
similarity index 100%
rename from modules/openstack_project/files/review.projects.yaml
rename to gerrit/projects.yaml
diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/gerritbot/channels.yaml
similarity index 100%
rename from modules/gerritbot/files/gerritbot_channel_config.yaml
rename to gerritbot/channels.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/jenkins/jobs/api-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
rename to jenkins/jobs/api-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/aviator-jobs.yaml b/jenkins/jobs/aviator-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/aviator-jobs.yaml
rename to jenkins/jobs/aviator-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml b/jenkins/jobs/barbican.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml
rename to jenkins/jobs/barbican.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml b/jenkins/jobs/blazar.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml
rename to jenkins/jobs/blazar.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml
rename to jenkins/jobs/ceilometer.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml b/jenkins/jobs/chef-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
rename to jenkins/jobs/chef-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml b/jenkins/jobs/defaults.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml
rename to jenkins/jobs/defaults.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml b/jenkins/jobs/designate.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/designate.yaml
rename to jenkins/jobs/designate.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
rename to jenkins/jobs/devstack-gate.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml b/jenkins/jobs/elastic-recheck.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml
rename to jenkins/jobs/elastic-recheck.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml b/jenkins/jobs/gerrit-plugin-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml
rename to jenkins/jobs/gerrit-plugin-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml b/jenkins/jobs/gerrit.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
rename to jenkins/jobs/gerrit.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml b/jenkins/jobs/gitdm.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml
rename to jenkins/jobs/gitdm.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml b/jenkins/jobs/groups.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
rename to jenkins/jobs/groups.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml b/jenkins/jobs/hacking.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml
rename to jenkins/jobs/hacking.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml b/jenkins/jobs/heat.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/heat.yaml
rename to jenkins/jobs/heat.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/hooks.yaml b/jenkins/jobs/hooks.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/hooks.yaml
rename to jenkins/jobs/hooks.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml b/jenkins/jobs/horizon.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
rename to jenkins/jobs/horizon.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml b/jenkins/jobs/infra-publications.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml
rename to jenkins/jobs/infra-publications.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml b/jenkins/jobs/infra-publish-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml
rename to jenkins/jobs/infra-publish-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml b/jenkins/jobs/infra.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/infra.yaml
rename to jenkins/jobs/infra.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/ironic-python-agent-jobs.yaml b/jenkins/jobs/ironic-python-agent-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/ironic-python-agent-jobs.yaml
rename to jenkins/jobs/ironic-python-agent-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml b/jenkins/jobs/javascript.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
rename to jenkins/jobs/javascript.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/jenkins/jobs/jenkins-plugin-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
rename to jenkins/jobs/jenkins-plugin-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml b/jenkins/jobs/job-builder.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml
rename to jenkins/jobs/job-builder.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/jenkins/jobs/macros.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
rename to jenkins/jobs/macros.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml b/jenkins/jobs/magnetodb.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml
rename to jenkins/jobs/magnetodb.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/jenkins/jobs/manila.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
rename to jenkins/jobs/manila.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/jenkins/jobs/manuals-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
rename to jenkins/jobs/manuals-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml b/jenkins/jobs/maven-plugin-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
rename to jenkins/jobs/maven-plugin-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/jenkins/jobs/misc.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
rename to jenkins/jobs/misc.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml b/jenkins/jobs/mistral.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml
rename to jenkins/jobs/mistral.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml b/jenkins/jobs/murano.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/murano.yaml
rename to jenkins/jobs/murano.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/neutron-api.yaml b/jenkins/jobs/neutron-api.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/neutron-api.yaml
rename to jenkins/jobs/neutron-api.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml b/jenkins/jobs/neutron-functional.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml
rename to jenkins/jobs/neutron-functional.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/nodepool.yaml b/jenkins/jobs/nodepool.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/nodepool.yaml
rename to jenkins/jobs/nodepool.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml b/jenkins/jobs/nova-docker.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml
rename to jenkins/jobs/nova-docker.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-planet.yaml b/jenkins/jobs/openstack-planet.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/openstack-planet.yaml
rename to jenkins/jobs/openstack-planet.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml b/jenkins/jobs/openstack-publish-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml
rename to jenkins/jobs/openstack-publish-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml b/jenkins/jobs/openstackid.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml
rename to jenkins/jobs/openstackid.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/osc-functional.yaml b/jenkins/jobs/osc-functional.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/osc-functional.yaml
rename to jenkins/jobs/osc-functional.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml b/jenkins/jobs/oslo.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml
rename to jenkins/jobs/oslo.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/jenkins/jobs/projects.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
rename to jenkins/jobs/projects.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
rename to jenkins/jobs/puppet-module-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml b/jenkins/jobs/pypi-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml
rename to jenkins/jobs/pypi-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml b/jenkins/jobs/python-bitrot-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
rename to jenkins/jobs/python-bitrot-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
rename to jenkins/jobs/python-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml b/jenkins/jobs/rally.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
rename to jenkins/jobs/rally.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/jenkins/jobs/requirements.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml
rename to jenkins/jobs/requirements.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml b/jenkins/jobs/solum.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/solum.yaml
rename to jenkins/jobs/solum.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/specs-jobs.yaml b/jenkins/jobs/specs-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/specs-jobs.yaml
rename to jenkins/jobs/specs-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/sqlalchemy-migrate.yaml b/jenkins/jobs/sqlalchemy-migrate.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/sqlalchemy-migrate.yaml
rename to jenkins/jobs/sqlalchemy-migrate.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml b/jenkins/jobs/storyboard.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
rename to jenkins/jobs/storyboard.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/swift.yaml b/jenkins/jobs/swift.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/swift.yaml
rename to jenkins/jobs/swift.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml b/jenkins/jobs/translation-jobs.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
rename to jenkins/jobs/translation-jobs.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml b/jenkins/jobs/tripleo.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
rename to jenkins/jobs/tripleo.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml b/jenkins/jobs/trove.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/trove.yaml
rename to jenkins/jobs/trove.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tuskar-ui.yaml b/jenkins/jobs/tuskar-ui.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/tuskar-ui.yaml
rename to jenkins/jobs/tuskar-ui.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml b/jenkins/jobs/vinz.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml
rename to jenkins/jobs/vinz.yaml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml b/jenkins/jobs/zuul.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
rename to jenkins/jobs/zuul.yaml
diff --git a/modules/openstack_project/files/slave_scripts/baremetal-archive-logs.sh b/jenkins/scripts/baremetal-archive-logs.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/baremetal-archive-logs.sh
rename to jenkins/scripts/baremetal-archive-logs.sh
diff --git a/modules/openstack_project/files/slave_scripts/baremetal-deploy.sh b/jenkins/scripts/baremetal-deploy.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/baremetal-deploy.sh
rename to jenkins/scripts/baremetal-deploy.sh
diff --git a/modules/openstack_project/files/slave_scripts/baremetal-os-install.sh b/jenkins/scripts/baremetal-os-install.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/baremetal-os-install.sh
rename to jenkins/scripts/baremetal-os-install.sh
diff --git a/modules/openstack_project/files/slave_scripts/bump-milestone.sh b/jenkins/scripts/bump-milestone.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/bump-milestone.sh
rename to jenkins/scripts/bump-milestone.sh
diff --git a/modules/openstack_project/files/slave_scripts/common_translation_update.sh b/jenkins/scripts/common_translation_update.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/common_translation_update.sh
rename to jenkins/scripts/common_translation_update.sh
diff --git a/modules/openstack_project/files/slave_scripts/create-ppa-package.sh b/jenkins/scripts/create-ppa-package.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/create-ppa-package.sh
rename to jenkins/scripts/create-ppa-package.sh
diff --git a/modules/openstack_project/files/slave_scripts/gerrit-git-prep.sh b/jenkins/scripts/gerrit-git-prep.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/gerrit-git-prep.sh
rename to jenkins/scripts/gerrit-git-prep.sh
diff --git a/modules/openstack_project/files/slave_scripts/grab_console_log.sh b/jenkins/scripts/grab_console_log.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/grab_console_log.sh
rename to jenkins/scripts/grab_console_log.sh
diff --git a/modules/openstack_project/files/slave_scripts/jenkins-oom-grep.sh b/jenkins/scripts/jenkins-oom-grep.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/jenkins-oom-grep.sh
rename to jenkins/scripts/jenkins-oom-grep.sh
diff --git a/modules/openstack_project/files/slave_scripts/jenkins-sudo-grep.sh b/jenkins/scripts/jenkins-sudo-grep.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/jenkins-sudo-grep.sh
rename to jenkins/scripts/jenkins-sudo-grep.sh
diff --git a/modules/openstack_project/files/slave_scripts/jenkinsci-upload.sh b/jenkins/scripts/jenkinsci-upload.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/jenkinsci-upload.sh
rename to jenkins/scripts/jenkinsci-upload.sh
diff --git a/modules/openstack_project/files/slave_scripts/lvm-kexec-reset.sh b/jenkins/scripts/lvm-kexec-reset.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/lvm-kexec-reset.sh
rename to jenkins/scripts/lvm-kexec-reset.sh
diff --git a/modules/openstack_project/files/slave_scripts/mavencentral-upload.sh b/jenkins/scripts/mavencentral-upload.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/mavencentral-upload.sh
rename to jenkins/scripts/mavencentral-upload.sh
diff --git a/modules/openstack_project/files/slave_scripts/merge_tags.sh b/jenkins/scripts/merge_tags.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/merge_tags.sh
rename to jenkins/scripts/merge_tags.sh
diff --git a/modules/openstack_project/files/slave_scripts/package-gerrit.sh b/jenkins/scripts/package-gerrit.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/package-gerrit.sh
rename to jenkins/scripts/package-gerrit.sh
diff --git a/modules/openstack_project/files/slave_scripts/php-laravel-build.sh b/jenkins/scripts/php-laravel-build.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/php-laravel-build.sh
rename to jenkins/scripts/php-laravel-build.sh
diff --git a/modules/openstack_project/files/slave_scripts/ping.py b/jenkins/scripts/ping.py
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/ping.py
rename to jenkins/scripts/ping.py
diff --git a/modules/openstack_project/files/slave_scripts/project-requirements-change.py b/jenkins/scripts/project-requirements-change.py
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/project-requirements-change.py
rename to jenkins/scripts/project-requirements-change.py
diff --git a/modules/openstack_project/files/slave_scripts/propose_translation_update.sh b/jenkins/scripts/propose_translation_update.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/propose_translation_update.sh
rename to jenkins/scripts/propose_translation_update.sh
diff --git a/modules/openstack_project/files/slave_scripts/propose_translation_update_django_openstack_auth.sh b/jenkins/scripts/propose_translation_update_django_openstack_auth.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/propose_translation_update_django_openstack_auth.sh
rename to jenkins/scripts/propose_translation_update_django_openstack_auth.sh
diff --git a/modules/openstack_project/files/slave_scripts/propose_translation_update_horizon.sh b/jenkins/scripts/propose_translation_update_horizon.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/propose_translation_update_horizon.sh
rename to jenkins/scripts/propose_translation_update_horizon.sh
diff --git a/modules/openstack_project/files/slave_scripts/propose_translation_update_manuals.sh b/jenkins/scripts/propose_translation_update_manuals.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/propose_translation_update_manuals.sh
rename to jenkins/scripts/propose_translation_update_manuals.sh
diff --git a/modules/openstack_project/files/slave_scripts/propose_update.sh b/jenkins/scripts/propose_update.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/propose_update.sh
rename to jenkins/scripts/propose_update.sh
diff --git a/modules/openstack_project/files/slave_scripts/pypi-extract-name.py b/jenkins/scripts/pypi-extract-name.py
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/pypi-extract-name.py
rename to jenkins/scripts/pypi-extract-name.py
diff --git a/modules/openstack_project/files/slave_scripts/pypi-extract-universal.py b/jenkins/scripts/pypi-extract-universal.py
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/pypi-extract-universal.py
rename to jenkins/scripts/pypi-extract-universal.py
diff --git a/modules/openstack_project/files/slave_scripts/pypi-tarball-upload.sh b/jenkins/scripts/pypi-tarball-upload.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/pypi-tarball-upload.sh
rename to jenkins/scripts/pypi-tarball-upload.sh
diff --git a/modules/openstack_project/files/slave_scripts/pypi-wheel-upload.sh b/jenkins/scripts/pypi-wheel-upload.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/pypi-wheel-upload.sh
rename to jenkins/scripts/pypi-wheel-upload.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-cover.sh b/jenkins/scripts/run-cover.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-cover.sh
rename to jenkins/scripts/run-cover.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-docs.sh b/jenkins/scripts/run-docs.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-docs.sh
rename to jenkins/scripts/run-docs.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-jsbuild.sh b/jenkins/scripts/run-jsbuild.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-jsbuild.sh
rename to jenkins/scripts/run-jsbuild.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-pep8.sh b/jenkins/scripts/run-pep8.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-pep8.sh
rename to jenkins/scripts/run-pep8.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-pylint.sh b/jenkins/scripts/run-pylint.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-pylint.sh
rename to jenkins/scripts/run-pylint.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-selenium.sh b/jenkins/scripts/run-selenium.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-selenium.sh
rename to jenkins/scripts/run-selenium.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-tarball.sh b/jenkins/scripts/run-tarball.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-tarball.sh
rename to jenkins/scripts/run-tarball.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-tox.sh b/jenkins/scripts/run-tox.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-tox.sh
rename to jenkins/scripts/run-tox.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-unittests.sh b/jenkins/scripts/run-unittests.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-unittests.sh
rename to jenkins/scripts/run-unittests.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-wheel.sh b/jenkins/scripts/run-wheel.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-wheel.sh
rename to jenkins/scripts/run-wheel.sh
diff --git a/modules/openstack_project/files/slave_scripts/run-xmllint.sh b/jenkins/scripts/run-xmllint.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-xmllint.sh
rename to jenkins/scripts/run-xmllint.sh
diff --git a/modules/openstack_project/files/slave_scripts/subunit2html.py b/jenkins/scripts/subunit2html.py
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/subunit2html.py
rename to jenkins/scripts/subunit2html.py
diff --git a/modules/openstack_project/files/slave_scripts/tardiff.py b/jenkins/scripts/tardiff.py
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/tardiff.py
rename to jenkins/scripts/tardiff.py
diff --git a/modules/openstack_project/files/slave_scripts/update-pip-cache.sh b/jenkins/scripts/update-pip-cache.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/update-pip-cache.sh
rename to jenkins/scripts/update-pip-cache.sh
diff --git a/modules/openstack_project/files/slave_scripts/upstream_translation_django_openstack_auth.sh b/jenkins/scripts/upstream_translation_django_openstack_auth.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/upstream_translation_django_openstack_auth.sh
rename to jenkins/scripts/upstream_translation_django_openstack_auth.sh
diff --git a/modules/openstack_project/files/slave_scripts/upstream_translation_horizon.sh b/jenkins/scripts/upstream_translation_horizon.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/upstream_translation_horizon.sh
rename to jenkins/scripts/upstream_translation_horizon.sh
diff --git a/modules/openstack_project/files/slave_scripts/upstream_translation_update.sh b/jenkins/scripts/upstream_translation_update.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/upstream_translation_update.sh
rename to jenkins/scripts/upstream_translation_update.sh
diff --git a/modules/openstack_project/files/slave_scripts/upstream_translation_update_manuals.sh b/jenkins/scripts/upstream_translation_update_manuals.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/upstream_translation_update_manuals.sh
rename to jenkins/scripts/upstream_translation_update_manuals.sh
diff --git a/modules/openstack_project/files/slave_scripts/version-properties.sh b/jenkins/scripts/version-properties.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/version-properties.sh
rename to jenkins/scripts/version-properties.sh
diff --git a/modules/openstack_project/files/slave_scripts/wait_for_nova.sh b/jenkins/scripts/wait_for_nova.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/wait_for_nova.sh
rename to jenkins/scripts/wait_for_nova.sh
diff --git a/modules/openstack_project/files/slave_scripts/wait_for_puppet.sh b/jenkins/scripts/wait_for_puppet.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/wait_for_puppet.sh
rename to jenkins/scripts/wait_for_puppet.sh
diff --git a/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py b/jenkins/scripts/zuul_swift_upload.py
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/zuul_swift_upload.py
rename to jenkins/scripts/zuul_swift_upload.py
diff --git a/modules/openstack_project/files/nodepool/elements/README.rst b/nodepool/elements/README.rst
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/README.rst
rename to nodepool/elements/README.rst
diff --git a/modules/openstack_project/files/nodepool/elements/cache-devstack/README.rst b/nodepool/elements/cache-devstack/README.rst
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/cache-devstack/README.rst
rename to nodepool/elements/cache-devstack/README.rst
diff --git a/modules/openstack_project/files/nodepool/elements/cache-devstack/element-deps b/nodepool/elements/cache-devstack/element-deps
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/cache-devstack/element-deps
rename to nodepool/elements/cache-devstack/element-deps
diff --git a/modules/openstack_project/files/nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo b/nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo
rename to nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo
diff --git a/modules/openstack_project/files/nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos b/nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos
rename to nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos
diff --git a/modules/openstack_project/files/nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo b/nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo
rename to nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo
diff --git a/modules/openstack_project/files/nodepool/elements/cache-devstack/install.d/50-download-pkgs b/nodepool/elements/cache-devstack/install.d/50-download-pkgs
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/cache-devstack/install.d/50-download-pkgs
rename to nodepool/elements/cache-devstack/install.d/50-download-pkgs
diff --git a/modules/openstack_project/files/nodepool/elements/node-devstack/README.rst b/nodepool/elements/node-devstack/README.rst
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/node-devstack/README.rst
rename to nodepool/elements/node-devstack/README.rst
diff --git a/modules/openstack_project/files/nodepool/elements/node-devstack/element-deps b/nodepool/elements/node-devstack/element-deps
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/node-devstack/element-deps
rename to nodepool/elements/node-devstack/element-deps
diff --git a/modules/openstack_project/files/nodepool/elements/node-devstack/install.d/20-prepare-node b/nodepool/elements/node-devstack/install.d/20-prepare-node
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/node-devstack/install.d/20-prepare-node
rename to nodepool/elements/node-devstack/install.d/20-prepare-node
diff --git a/modules/openstack_project/files/nodepool/elements/nodepool-base/README.rst b/nodepool/elements/nodepool-base/README.rst
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/nodepool-base/README.rst
rename to nodepool/elements/nodepool-base/README.rst
diff --git a/modules/openstack_project/files/nodepool/elements/nodepool-base/extra-data.d/50-copy-nodepool-scripts b/nodepool/elements/nodepool-base/extra-data.d/50-copy-nodepool-scripts
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/nodepool-base/extra-data.d/50-copy-nodepool-scripts
rename to nodepool/elements/nodepool-base/extra-data.d/50-copy-nodepool-scripts
diff --git a/modules/openstack_project/files/nodepool/elements/nodepool-base/finalise.d/99-nodepool-dir b/nodepool/elements/nodepool-base/finalise.d/99-nodepool-dir
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/nodepool-base/finalise.d/99-nodepool-dir
rename to nodepool/elements/nodepool-base/finalise.d/99-nodepool-dir
diff --git a/modules/openstack_project/files/nodepool/elements/nodepool-base/finalise.d/99-unbound b/nodepool/elements/nodepool-base/finalise.d/99-unbound
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/nodepool-base/finalise.d/99-unbound
rename to nodepool/elements/nodepool-base/finalise.d/99-unbound
diff --git a/modules/openstack_project/files/nodepool/elements/nodepool-base/install.d/05-record-details b/nodepool/elements/nodepool-base/install.d/05-record-details
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/nodepool-base/install.d/05-record-details
rename to nodepool/elements/nodepool-base/install.d/05-record-details
diff --git a/modules/openstack_project/files/nodepool/elements/nodepool-base/install.d/50-restrict-memory b/nodepool/elements/nodepool-base/install.d/50-restrict-memory
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/nodepool-base/install.d/50-restrict-memory
rename to nodepool/elements/nodepool-base/install.d/50-restrict-memory
diff --git a/modules/openstack_project/files/nodepool/elements/nodepool-base/install.d/99-install-zuul b/nodepool/elements/nodepool-base/install.d/99-install-zuul
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/nodepool-base/install.d/99-install-zuul
rename to nodepool/elements/nodepool-base/install.d/99-install-zuul
diff --git a/modules/openstack_project/files/nodepool/elements/openstack-repos/README.rst b/nodepool/elements/openstack-repos/README.rst
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/openstack-repos/README.rst
rename to nodepool/elements/openstack-repos/README.rst
diff --git a/modules/openstack_project/files/nodepool/elements/openstack-repos/element-deps b/nodepool/elements/openstack-repos/element-deps
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/openstack-repos/element-deps
rename to nodepool/elements/openstack-repos/element-deps
diff --git a/modules/openstack_project/files/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list b/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list
rename to nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list
diff --git a/modules/openstack_project/files/nodepool/elements/openstack-repos/install.d/95-chown-jenkins b/nodepool/elements/openstack-repos/install.d/95-chown-jenkins
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/openstack-repos/install.d/95-chown-jenkins
rename to nodepool/elements/openstack-repos/install.d/95-chown-jenkins
diff --git a/modules/openstack_project/files/nodepool/elements/puppet/README.rst b/nodepool/elements/puppet/README.rst
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/puppet/README.rst
rename to nodepool/elements/puppet/README.rst
diff --git a/modules/openstack_project/files/nodepool/elements/puppet/bin/prepare-node b/nodepool/elements/puppet/bin/prepare-node
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/puppet/bin/prepare-node
rename to nodepool/elements/puppet/bin/prepare-node
diff --git a/modules/openstack_project/files/nodepool/elements/puppet/element-deps b/nodepool/elements/puppet/element-deps
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/puppet/element-deps
rename to nodepool/elements/puppet/element-deps
diff --git a/modules/openstack_project/files/nodepool/elements/puppet/install.d/05-puppet b/nodepool/elements/puppet/install.d/05-puppet
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/puppet/install.d/05-puppet
rename to nodepool/elements/puppet/install.d/05-puppet
diff --git a/modules/openstack_project/files/nodepool/elements/puppet/install.d/95-clean-repos b/nodepool/elements/puppet/install.d/95-clean-repos
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/puppet/install.d/95-clean-repos
rename to nodepool/elements/puppet/install.d/95-clean-repos
diff --git a/modules/openstack_project/files/nodepool/elements/puppet/install.d/96-clean-cron b/nodepool/elements/puppet/install.d/96-clean-cron
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/puppet/install.d/96-clean-cron
rename to nodepool/elements/puppet/install.d/96-clean-cron
diff --git a/modules/openstack_project/files/nodepool/elements/puppet/pre-install.d/10-preseed b/nodepool/elements/puppet/pre-install.d/10-preseed
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/puppet/pre-install.d/10-preseed
rename to nodepool/elements/puppet/pre-install.d/10-preseed
diff --git a/modules/openstack_project/files/nodepool/elements/slave-db/README.rst b/nodepool/elements/slave-db/README.rst
similarity index 100%
rename from modules/openstack_project/files/nodepool/elements/slave-db/README.rst
rename to nodepool/elements/slave-db/README.rst
diff --git a/modules/openstack_project/files/nodepool/scripts/cache_devstack.py b/nodepool/scripts/cache_devstack.py
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/cache_devstack.py
rename to nodepool/scripts/cache_devstack.py
diff --git a/modules/openstack_project/files/nodepool/scripts/cache_git_repos.py b/nodepool/scripts/cache_git_repos.py
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/cache_git_repos.py
rename to nodepool/scripts/cache_git_repos.py
diff --git a/modules/openstack_project/files/nodepool/scripts/common.py b/nodepool/scripts/common.py
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/common.py
rename to nodepool/scripts/common.py
diff --git a/modules/openstack_project/files/nodepool/scripts/configure_mirror.sh b/nodepool/scripts/configure_mirror.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/configure_mirror.sh
rename to nodepool/scripts/configure_mirror.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/convert_node_to_xenserver.sh b/nodepool/scripts/convert_node_to_xenserver.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/convert_node_to_xenserver.sh
rename to nodepool/scripts/convert_node_to_xenserver.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/fix_pip.sh b/nodepool/scripts/fix_pip.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/fix_pip.sh
rename to nodepool/scripts/fix_pip.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/install_devstack_dependencies.sh b/nodepool/scripts/install_devstack_dependencies.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/install_devstack_dependencies.sh
rename to nodepool/scripts/install_devstack_dependencies.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/install_xenserver.sh b/nodepool/scripts/install_xenserver.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/install_xenserver.sh
rename to nodepool/scripts/install_xenserver.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/multinode_setup.sh b/nodepool/scripts/multinode_setup.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/multinode_setup.sh
rename to nodepool/scripts/multinode_setup.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh b/nodepool/scripts/prepare_devstack.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh
rename to nodepool/scripts/prepare_devstack.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_devstack_virt_preview.sh b/nodepool/scripts/prepare_devstack_virt_preview.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/prepare_devstack_virt_preview.sh
rename to nodepool/scripts/prepare_devstack_virt_preview.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh b/nodepool/scripts/prepare_node.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/prepare_node.sh
rename to nodepool/scripts/prepare_node.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh b/nodepool/scripts/prepare_node_bare.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh
rename to nodepool/scripts/prepare_node_bare.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh b/nodepool/scripts/prepare_node_devstack.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh
rename to nodepool/scripts/prepare_node_devstack.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_virt_preview.sh b/nodepool/scripts/prepare_node_devstack_virt_preview.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_virt_preview.sh
rename to nodepool/scripts/prepare_node_devstack_virt_preview.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_py3k.sh b/nodepool/scripts/prepare_node_py3k.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/prepare_node_py3k.sh
rename to nodepool/scripts/prepare_node_py3k.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh b/nodepool/scripts/prepare_node_tripleo.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
rename to nodepool/scripts/prepare_node_tripleo.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh b/nodepool/scripts/prepare_tripleo.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh
rename to nodepool/scripts/prepare_tripleo.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/restrict_memory.sh b/nodepool/scripts/restrict_memory.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/restrict_memory.sh
rename to nodepool/scripts/restrict_memory.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/xenserver_helper_initramfs_hook.sh b/nodepool/scripts/xenserver_helper_initramfs_hook.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/xenserver_helper_initramfs_hook.sh
rename to nodepool/scripts/xenserver_helper_initramfs_hook.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/xenserver_helper_initramfs_premount.sh b/nodepool/scripts/xenserver_helper_initramfs_premount.sh
similarity index 100%
rename from modules/openstack_project/files/nodepool/scripts/xenserver_helper_initramfs_premount.sh
rename to nodepool/scripts/xenserver_helper_initramfs_premount.sh
diff --git a/modules/openstack_project/files/specs/index.html b/specs/index.html
similarity index 100%
rename from modules/openstack_project/files/specs/index.html
rename to specs/index.html
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/zuul/layout.yaml
similarity index 100%
rename from modules/openstack_project/files/zuul/layout.yaml
rename to zuul/layout.yaml
diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/zuul/openstack_functions.py
similarity index 100%
rename from modules/openstack_project/files/zuul/openstack_functions.py
rename to zuul/openstack_functions.py