reoganized, fixed duplicated URIs