Restructure manifests. Correct a few puppet lint notices.