correct links and reorganize
cleaned minor