Some renames (cleaning up files), updated submodule reference, updated the README.md.