Rename files and functions
Updates README