Delete copy version of apache repo.
Delete copied version of puppet modules.
Add separate repos as git submodules.