Adjust paths and header