Renaming and readme enhancements