some renames, updated readme