Moving modules into manifests