Adding/renaming these files. Unit tests pass. Some formatting fixes where things were obvious.