Cleanup: moving some files, updating README.md