move files around
fix some typos