Better path handling, renamed manual/ to overrides/