Refactor secrets to macros in a single file, add provider keys.