Manifests + Modules refactored