cleaning up filenames
more renames, updated tests
updated readme
fixing for merge