Upgrade to pathwather with better doc organization