Start moving non-secrets from secret directory

This commit starts the migration of non-secret things from the secret
directory. This will make recreation of CV easier in the event that the
secrets are lost and makes setting up a Vagrant test network easier.