Fix readme and rename files

+ minor diff change