General rearrangement and written README