Corrected names and rearranged some docs