fixed minor typos, reorganised directory