Reorganizing packages, correcting typos, etc...