Fixed a couple typos in previous commit; started moving files around