Better README and some renames