POC: Adjust paths and headers