Copypasta cleanup, move dicts, add test file
Update README.md for new files